The branch, master has been updated via acf2e0a0340bfca162120c08b29f85e763cf08a5 (commit) via ccb072d1a905b7426a003c17ad78415440177a26 (commit) via 9ff2a7bab7bf37ea57f4647eea6f3846cf238645 (commit) via 2a1d7df2e1ec078824acce4df7e62a174cc65b10 (commit) via 79717e8a8361d9e74d677284b2aa7b13d18e81af (commit) via 5745f099e73d1556c312fc972e9c75ba88e1d51d (commit) via 825c1048767a0a5a8e85f6e99ec73a1ff2a9107c (commit) via 1016f69047f796a9d33f3ebf4ac08b27fcec8f3c (commit) via 64af34eb5785f81d942ef1a4bb9dbcd04f585ee2 (commit) via 01b5319c6bde68e8a6138ad928e9f6b52fd51093 (commit) via b05197073b05bafda706dfb53597e8c54998a35d (commit) via 433b3fb8c78e15039535a8915bd6d9227a9830e9 (commit) via 326af3fc3d9e299f760b2c7be09558e0f6fe174d (commit) via eee2c5d09ed7967710e8e10b1efd31bfc203922b (commit) from e311848262b6e5e095a331818f1da4ba54c22f74 (commit)
- Log ----------------------------------------------------------------- commit acf2e0a0340bfca162120c08b29f85e763cf08a5 Merge: ccb072d1a905b7426a003c17ad78415440177a26 e311848262b6e5e095a331818f1da4ba54c22f74 Author: Pootle server pootle@cihar.com Date: Tue Jan 25 20:40:09 2011 +0100
Merge remote branch 'origin/master'
commit ccb072d1a905b7426a003c17ad78415440177a26 Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:26:37 2011 +0200
Translation update done using Pootle.
commit 9ff2a7bab7bf37ea57f4647eea6f3846cf238645 Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:25:56 2011 +0200
Translation update done using Pootle.
commit 2a1d7df2e1ec078824acce4df7e62a174cc65b10 Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:25:24 2011 +0200
Translation update done using Pootle.
commit 79717e8a8361d9e74d677284b2aa7b13d18e81af Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:24:10 2011 +0200
Translation update done using Pootle.
commit 5745f099e73d1556c312fc972e9c75ba88e1d51d Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:20:05 2011 +0200
Translation update done using Pootle.
commit 825c1048767a0a5a8e85f6e99ec73a1ff2a9107c Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:17:51 2011 +0200
Translation update done using Pootle.
commit 1016f69047f796a9d33f3ebf4ac08b27fcec8f3c Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:15:45 2011 +0200
Translation update done using Pootle.
commit 64af34eb5785f81d942ef1a4bb9dbcd04f585ee2 Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:12:57 2011 +0200
Translation update done using Pootle.
commit 01b5319c6bde68e8a6138ad928e9f6b52fd51093 Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:11:38 2011 +0200
Translation update done using Pootle.
commit b05197073b05bafda706dfb53597e8c54998a35d Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:11:12 2011 +0200
Translation update done using Pootle.
commit 433b3fb8c78e15039535a8915bd6d9227a9830e9 Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:10:54 2011 +0200
Translation update done using Pootle.
commit 326af3fc3d9e299f760b2c7be09558e0f6fe174d Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:09:03 2011 +0200
Translation update done using Pootle.
commit eee2c5d09ed7967710e8e10b1efd31bfc203922b Author: Victor Volkov hanut@php-myadmin.ru Date: Tue Jan 25 17:07:19 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/ru.po | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/po/ru.po b/po/ru.po index 00be8f1..6f6db5a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-24 23:01+0200\n" +"PO-Revision-Date: 2011-01-25 17:26+0200\n" "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n" "Language-Team: russian ru@li.org\n" "Language: ru\n" @@ -5604,36 +5604,31 @@ msgstr "Структура таблицы @TABLE@"
#: libraries/export/latex.php:47 libraries/export/odt.php:39 #: libraries/export/sql.php:87 -#, fuzzy #| msgid "Transformation options" msgid "Object creation options" -msgstr "Параметры преобразований" +msgstr "Параметры создания объектов"
#: libraries/export/latex.php:51 libraries/export/latex.php:75 -#, fuzzy #| msgid "Table caption" msgid "Table caption (continued)" -msgstr "Заголовок таблицы" +msgstr "Заголовок таблицы (продолжение)"
#: libraries/export/latex.php:56 libraries/export/odt.php:42 #: libraries/export/sql.php:40 -#, fuzzy #| msgid "Disable foreign key checks" msgid "Display foreign key relationships" -msgstr "Отключить проверку внешних ключей" +msgstr "Отобразить связи внешних ключей"
#: libraries/export/latex.php:59 libraries/export/odt.php:45 -#, fuzzy #| msgid "Displaying Column Comments" msgid "Display comments" -msgstr "Отображать комментарии столбцов" +msgstr "Отобразить комментарии"
#: libraries/export/latex.php:62 libraries/export/odt.php:48 #: libraries/export/sql.php:44 -#, fuzzy #| msgid "Available MIME types" msgid "Display MIME types" -msgstr "Доступные MIME-типы" +msgstr "Отобразить MIME типы"
#: libraries/export/latex.php:139 libraries/export/sql.php:281 #: libraries/export/xml.php:105 libraries/header_printview.inc.php:56 @@ -5674,7 +5669,6 @@ msgid "(Generates a report containing the data of a single table)" msgstr "(Создание отчета содержащего данные одной таблицы)"
#: libraries/export/pdf.php:24 -#, fuzzy #| msgid "Report title" msgid "Report title:" msgstr "Заголовок отчета" @@ -5688,40 +5682,46 @@ msgid "" "Display comments <i>(includes info such as export timestamp, PHP version, " "and server version)</i>" msgstr "" +"Вывести комментарии <i>(включает такую информацию, как: время экспорта, " +"версия PHP, и версия MySQL сервера)</i>"
#: libraries/export/sql.php:35 -#, fuzzy #| msgid "Add custom comment into header (\n splits lines)" msgid "Additional custom header comment (\n splits lines):" -msgstr "Добавить собственный комментарий в заголовок (перевод строки: \n)" +msgstr "" +"Добавить в заголовок собственный комментарий (\n" +" - разделитель строки):"
#: libraries/export/sql.php:37 msgid "" "Include a timestamp of when databases were created, last updated, and last " "checked" msgstr "" +"Включить время создания базы данных, время последнего обновления, и время " +"последней проверки"
#: libraries/export/sql.php:65 msgid "" "Database system or older MySQL server to maximize output compatibility with:" msgstr "" +"Максимальная совместимость с системой базы данных, или устаревшей версией " +"MySQL:"
#: libraries/export/sql.php:72 libraries/export/sql.php:105 #: libraries/export/sql.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Statements" msgid "Add %s statement" -msgstr "Характеристика" +msgstr "Добавить выражение %s"
#: libraries/export/sql.php:91 -#, fuzzy #| msgid "Statements" msgid "Add statements:" -msgstr "Характеристика" +msgstr "Добавить выражения:"
#: libraries/export/sql.php:111 msgid "<code>CREATE TABLE</code> options:" -msgstr "" +msgstr "Параметры <code>CREATE TABLE</code>:"
#: libraries/export/sql.php:123 msgid ""
hooks/post-receive