[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1522-g326f7e1
Michal Čihař
nijel at users.sourceforge.net
Mon Jan 31 10:01:43 CET 2011
The branch, master has been updated
via 326f7e13a982d164c89c0655402843f1fe88e651 (commit)
via afad83c975fe52c39db09e93bc9fb6b9c45b0f0f (commit)
via d352f02eae8fad47fb3a54ba69f257e127d33463 (commit)
via 75d758745dfc8fdfb877aa6623283807357a3bc2 (commit)
via a9bfd7b820858134ce8538f292dfc1673d486f2c (commit)
via eeb2da33ea9e2252565e90b33d05008a85d1107c (commit)
via efdc3b5407550d2db51bea485ee1c44a1fcba8ba (commit)
via 5dc499abc68a03700a2ca591feb872086ad6bfe7 (commit)
via cd2d9ac7b2271fc592505d877d5a1ce3032ab9e6 (commit)
via e3986d4b415e50a7c86ffab6b2bf954c6dfc0644 (commit)
via 9cab3874ffa2d3ae5e01c4252b73329c6b986e81 (commit)
via 81170b1c51091c07300fa9eba54eb15d937af953 (commit)
via 5d0a9f602a4801dbc9e03f9cab1ce1d5b588399c (commit)
via f9d4d6431a0cddb4698c25ad1cb435125b549884 (commit)
via e79e7e8f025ae8e187c553fb6ed232dffee5abc1 (commit)
via 5dc07efdb125b73fffa6c8cde3e22db732302d74 (commit)
via bd7c4df4d06922353afdd01f79b3938f88cf7713 (commit)
via 3d73dad2669c3b23745f40a479c3eb29520abab2 (commit)
via 427f2e483862c3c0c3aaf6f124446ad41b3b14a9 (commit)
via a8dce8c8315c17d13e8dfc6a008191e3b930ad83 (commit)
via 973ec50b6ea3b4e99799d36cd095c9f40354c98b (commit)
via 7fce20564965d0c106c2e8c0a164cbc68eeab1f1 (commit)
via ea02f19789ef498273b4c50e9c261eea79e768f5 (commit)
via 61fed3317788d3aab059b24eb4d16084a5938a96 (commit)
from 534d93fa4600c4edab647a0cbb2b260bef2d3994 (commit)
- Log -----------------------------------------------------------------
commit 326f7e13a982d164c89c0655402843f1fe88e651
Merge: 534d93fa4600c4edab647a0cbb2b260bef2d3994 afad83c975fe52c39db09e93bc9fb6b9c45b0f0f
Author: Michal Čihař <mcihar at novell.com>
Date: Mon Jan 31 10:01:31 2011 +0100
Merge remote branch 'pootle/master'
Conflicts:
po/ru.po
commit afad83c975fe52c39db09e93bc9fb6b9c45b0f0f
Merge: d352f02eae8fad47fb3a54ba69f257e127d33463 dea96e2e5ad21df2dd1c456457d451e137747e27
Author: Pootle server <pootle at cihar.com>
Date: Sat Jan 29 18:40:07 2011 +0100
Merge remote branch 'origin/master'
commit d352f02eae8fad47fb3a54ba69f257e127d33463
Merge: 75d758745dfc8fdfb877aa6623283807357a3bc2 3c573fc82e35834646ed861bbc53f55d30db1b4e
Author: Pootle server <pootle at cihar.com>
Date: Sat Jan 29 16:40:05 2011 +0100
Merge remote branch 'origin/master'
commit 75d758745dfc8fdfb877aa6623283807357a3bc2
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 16:02:30 2011 +0200
Translation update done using Pootle.
commit a9bfd7b820858134ce8538f292dfc1673d486f2c
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 16:00:35 2011 +0200
Translation update done using Pootle.
commit eeb2da33ea9e2252565e90b33d05008a85d1107c
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:57:59 2011 +0200
Translation update done using Pootle.
commit efdc3b5407550d2db51bea485ee1c44a1fcba8ba
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:57:00 2011 +0200
Translation update done using Pootle.
commit 5dc499abc68a03700a2ca591feb872086ad6bfe7
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:51:09 2011 +0200
Translation update done using Pootle.
commit cd2d9ac7b2271fc592505d877d5a1ce3032ab9e6
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:47:39 2011 +0200
Translation update done using Pootle.
commit e3986d4b415e50a7c86ffab6b2bf954c6dfc0644
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:46:24 2011 +0200
Translation update done using Pootle.
commit 9cab3874ffa2d3ae5e01c4252b73329c6b986e81
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:44:23 2011 +0200
Translation update done using Pootle.
commit 81170b1c51091c07300fa9eba54eb15d937af953
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:41:12 2011 +0200
Translation update done using Pootle.
commit 5d0a9f602a4801dbc9e03f9cab1ce1d5b588399c
Merge: f9d4d6431a0cddb4698c25ad1cb435125b549884 21fd381c84482d2792902034f3292d274e11383c
Author: Pootle server <pootle at cihar.com>
Date: Sat Jan 29 14:40:27 2011 +0100
Merge remote branch 'origin/master'
commit f9d4d6431a0cddb4698c25ad1cb435125b549884
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:39:12 2011 +0200
Translation update done using Pootle.
commit e79e7e8f025ae8e187c553fb6ed232dffee5abc1
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:37:52 2011 +0200
Translation update done using Pootle.
commit 5dc07efdb125b73fffa6c8cde3e22db732302d74
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:36:21 2011 +0200
Translation update done using Pootle.
commit bd7c4df4d06922353afdd01f79b3938f88cf7713
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:36:07 2011 +0200
Translation update done using Pootle.
commit 3d73dad2669c3b23745f40a479c3eb29520abab2
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:32:34 2011 +0200
Translation update done using Pootle.
commit 427f2e483862c3c0c3aaf6f124446ad41b3b14a9
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:28:45 2011 +0200
Translation update done using Pootle.
commit a8dce8c8315c17d13e8dfc6a008191e3b930ad83
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:27:22 2011 +0200
Translation update done using Pootle.
commit 973ec50b6ea3b4e99799d36cd095c9f40354c98b
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:22:07 2011 +0200
Translation update done using Pootle.
commit 7fce20564965d0c106c2e8c0a164cbc68eeab1f1
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 15:21:45 2011 +0200
Translation update done using Pootle.
commit ea02f19789ef498273b4c50e9c261eea79e768f5
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 14:21:36 2011 +0200
Translation update done using Pootle.
commit 61fed3317788d3aab059b24eb4d16084a5938a96
Author: Victor Volkov <hanut at php-myadmin.ru>
Date: Sat Jan 29 14:09:54 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/ru.po | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/po/ru.po b/po/ru.po
index 6478fb4..e926f72 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2011-01-29 15:09-0500\n"
-"PO-Revision-Date: 2011-01-25 17:26+0200\n"
+"PO-Revision-Date: 2011-01-29 16:02+0200\n"
"Last-Translator: Victor Volkov <hanut at php-myadmin.ru>\n"
"Language-Team: russian <ru at li.org>\n"
"MIME-Version: 1.0\n"
@@ -5502,26 +5502,28 @@ msgid ""
"Enclose table and field names with backquotes <i>(Protects field and table "
"names formed with special characters or keywords)</i>"
msgstr ""
+"Заключить имена таблиц и полей в обратные кавычки <i>(защищает имена таблиц "
+"и полей содержащих специальные символы или зарезервированные слова)</i>"
#: libraries/export/sql.php:136
msgid "Instead of <code>INSERT</code> statements, use:"
-msgstr ""
+msgstr "Использовать вместо <code>INSERT</code> выражения:"
#: libraries/export/sql.php:138
msgid "<code>INSERT DELAYED</code> statements"
-msgstr ""
+msgstr "<code>INSERT DELAYED</code>"
#: libraries/export/sql.php:140
msgid "<code>INSERT IGNORE</code> statements"
-msgstr ""
+msgstr "<code>INSERT IGNORE</code>"
#: libraries/export/sql.php:147
msgid "Function to use when dumping data:"
-msgstr ""
+msgstr "Использовать оператор при сохранении данных:"
#: libraries/export/sql.php:151
msgid "Syntax to use when inserting data:"
-msgstr ""
+msgstr "Использовать синтаксис при вставке данных:"
#: libraries/export/sql.php:154
msgid ""
@@ -5529,6 +5531,9 @@ msgid ""
" Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES "
"(1,2,3)</code>"
msgstr ""
+"включение имен полей в каждом выражении <code>INSERT</code> <br /> "
+" Пример: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES "
+"(1,2,3)</code>"
#: libraries/export/sql.php:155
msgid ""
@@ -5536,30 +5541,43 @@ msgid ""
" Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), "
"(7,8,9)</code>"
msgstr ""
+"включение нескольких строк в каждом выражении <code>INSERT</code><br /> "
+" Пример: <code>INSERT INTO tbl_name VALUES (1,2,3), "
+"(4,5,6), (7,8,9)</code>"
#: libraries/export/sql.php:156
msgid ""
"both of the above<br /> Example: <code>INSERT INTO "
"tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>"
msgstr ""
+"комбинация обоих верхних вариантов<br /> Пример: "
+"<code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), "
+"(7,8,9)</code>"
#: libraries/export/sql.php:157
msgid ""
"neither of the above<br /> Example: <code>INSERT INTO "
"tbl_name VALUES (1,2,3)</code>"
msgstr ""
+"ни один из выше перечисленных<br /> Пример: "
+"<code>INSERT INTO tbl_name VALUES (1,2,3)</code>"
#: libraries/export/sql.php:167
msgid ""
"Dump binary columns in hexadecimal notation <i>(for example, \"abc\" becomes "
"0x616263)</i>"
msgstr ""
+"Сохранение бинарных полей в шестнадцатеричном виде <i>(к примеру, \"abc\" "
+"станет 0x616263)</i>"
#: libraries/export/sql.php:171
msgid ""
"Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns to be dumped and "
"reloaded between servers in different time zones)</i>"
msgstr ""
+"Сохранять поля с типом TIMESTAMP в UTC <i>(позволяет сохранить и перенести "
+"поля с типом TIMESTAMP между серверами находящимися в различных временных "
+"зонах)</i>"
#: libraries/export/sql.php:393 libraries/export/xml.php:34
msgid "Procedures"
@@ -5604,13 +5622,12 @@ msgstr "XML"
#: libraries/export/xml.php:30
msgid "Object creation options (all are recommended)"
-msgstr ""
+msgstr "Параметры создания объекта (рекомендуется выбрать все)"
#: libraries/export/xml.php:40
-#, fuzzy
#| msgid "View"
msgid "Views"
-msgstr "Представление"
+msgstr "Представления"
#: libraries/export/xml.php:47
msgid "Export contents"
@@ -5674,6 +5691,8 @@ msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
msgstr ""
+"Первая строка файла содержит имена полей таблицы <i>(если данный параметр не "
+"выбран, то первая строка будет частью данных)</i>"
#: libraries/import/csv.php:39
msgid ""
@@ -5681,12 +5700,14 @@ msgid ""
"database, list the corresponding column names here. Column names must be "
"separated by commas and not enclosed in quotations."
msgstr ""
+"Если данные в строках файла расположены не в том же порядке, как в базе "
+"данных, введите здесь имена полей в соответствующей последовательности. "
+"Имена полей разделяются запятыми и не должны быть заключены в кавычки."
#: libraries/import/csv.php:41
-#, fuzzy
#| msgid "Column names"
msgid "Column names: "
-msgstr "Названия столбцов"
+msgstr "Названия столбцов:"
#: libraries/import/csv.php:60 libraries/import/csv.php:72
#: libraries/import/csv.php:76 libraries/import/csv.php:80
@@ -5700,6 +5721,8 @@ msgid ""
"Invalid column (%s) specified! Ensure that columns names are spelled "
"correctly, separated by commas, and not enclosed in quotes."
msgstr ""
+"Указано ошибочное имя столбца (%s)! Убедитесь, что названия столбцов указаны "
+"верно, разделены запятыми, и не заключены в кавычки."
#: libraries/import/csv.php:179 libraries/import/csv.php:426
#, php-format
@@ -5707,10 +5730,10 @@ msgid "Invalid format of CSV input on line %d."
msgstr "Неправильный формат входных CSV-данных в строке %d."
#: libraries/import/csv.php:314
-#, fuzzy, php-format
+#, php-format
#| msgid "Invalid field count in CSV input on line %d."
msgid "Invalid column count in CSV input on line %d."
-msgstr "Неправильное количество полей во входных CSV-данных в строке %d."
+msgstr "Несоответствие количества столбцов в CSV данных на строке %d."
#: libraries/import/docsql.php:27
msgid "DocSQL"
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list