The branch, master has been updated via 983a8403c8804ae2acf0dd2bd179118707b6a54d (commit) via 7a1bae544c48162ecd2d32294edcd6d09add4cb4 (commit) via 178a773c6db8e7b8079c66df82a4df3db17d5716 (commit) via 2d50f7993a9417c797fbaf17cee1024e7f9e99d7 (commit) via e594503ee0a851a9de8d7be6145caf2bd3ec70cb (commit) via f19538d91fa1cf3a7e2b330c947f50e79ef4a12c (commit) via 50c267080fc418e86bc47d3e10799583cc5f8006 (commit) via cbed715699147a3bde66d3290f6b4ee19e22420d (commit) via 1ce6a00260b806ce3f23f247f7af022b280f9d22 (commit) via 5bf74b7daa9d98064d8e51de871612b806944df3 (commit) via 6b7f861ce1368c964e5121dc374f71db7c871ee7 (commit) via 567d0e05536719f004178b1b21fd52a5fb4c601b (commit) via 4af2acdd138fb95a569ca10f71d151e4e09b17b8 (commit) via 343b87cc6d6da4565bc60ac3b32bdeebae9815c0 (commit) via db29aac93a6c42d111dfbb05484f24dee49cb62c (commit) via 5272b710522c8c831af3cccb897370f4a6e742c1 (commit) via 44a33415a33d62c841adf67c33938376f47cd43e (commit) via 50c9a8de713342e07836a5c3f04618221fe17185 (commit) via f9c65c67f9d2b609b1c95da9ed8c36ac5bb39199 (commit) via 24118ff50d2653a63136196021e131f065df4c41 (commit) via 65cbb90eee500e21c2356848b267009db87865b3 (commit) via 5900706ae7f9832bd4ebac91a36fc4a753a36d6f (commit) via 7f4cd021732524e8c1fe96fe7b43cdaf6045b52b (commit) via 204d9b8f4f8ae9c16cc5995e9cac492872fd1fcb (commit) via f072a8fe0129a2ed4a099d976b061735aab9394a (commit) via 248bb3f265ae224a705950d9e49c99b3f29b8f62 (commit) via 6b939bae63b214c2c3f3a39a8f88aad405bb9fda (commit) via f163777cc8c83a70694af68b32ef20b988f307bc (commit) via 5efda01d1f32598c28999d2916fb3276a39ab1d7 (commit) via 321b0ab6f00d93b6886127466674b8da9e6bb1b2 (commit) from bb0229fc07e40347d02b26ad84399ac6cd91354f (commit)
- Log ----------------------------------------------------------------- commit 983a8403c8804ae2acf0dd2bd179118707b6a54d Merge: 7a1bae544c48162ecd2d32294edcd6d09add4cb4 bb0229fc07e40347d02b26ad84399ac6cd91354f Author: Pootle server pootle@cihar.com Date: Fri Jan 21 04:40:33 2011 +0100
Merge remote branch 'origin/master'
commit 7a1bae544c48162ecd2d32294edcd6d09add4cb4 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:40:53 2011 +0200
Translation update done using Pootle.
commit 178a773c6db8e7b8079c66df82a4df3db17d5716 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:39:07 2011 +0200
Translation update done using Pootle.
commit 2d50f7993a9417c797fbaf17cee1024e7f9e99d7 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:38:29 2011 +0200
Translation update done using Pootle.
commit e594503ee0a851a9de8d7be6145caf2bd3ec70cb Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:38:08 2011 +0200
Translation update done using Pootle.
commit f19538d91fa1cf3a7e2b330c947f50e79ef4a12c Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:37:10 2011 +0200
Translation update done using Pootle.
commit 50c267080fc418e86bc47d3e10799583cc5f8006 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:36:53 2011 +0200
Translation update done using Pootle.
commit cbed715699147a3bde66d3290f6b4ee19e22420d Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:34:21 2011 +0200
Translation update done using Pootle.
commit 1ce6a00260b806ce3f23f247f7af022b280f9d22 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:30:26 2011 +0200
Translation update done using Pootle.
commit 5bf74b7daa9d98064d8e51de871612b806944df3 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:27:53 2011 +0200
Translation update done using Pootle.
commit 6b7f861ce1368c964e5121dc374f71db7c871ee7 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:27:37 2011 +0200
Translation update done using Pootle.
commit 567d0e05536719f004178b1b21fd52a5fb4c601b Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:27:03 2011 +0200
Translation update done using Pootle.
commit 4af2acdd138fb95a569ca10f71d151e4e09b17b8 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:24:43 2011 +0200
Translation update done using Pootle.
commit 343b87cc6d6da4565bc60ac3b32bdeebae9815c0 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:22:12 2011 +0200
Translation update done using Pootle.
commit db29aac93a6c42d111dfbb05484f24dee49cb62c Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:17:27 2011 +0200
Translation update done using Pootle.
commit 5272b710522c8c831af3cccb897370f4a6e742c1 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:16:53 2011 +0200
Translation update done using Pootle.
commit 44a33415a33d62c841adf67c33938376f47cd43e Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:16:44 2011 +0200
Translation update done using Pootle.
commit 50c9a8de713342e07836a5c3f04618221fe17185 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:16:24 2011 +0200
Translation update done using Pootle.
commit f9c65c67f9d2b609b1c95da9ed8c36ac5bb39199 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:15:48 2011 +0200
Translation update done using Pootle.
commit 24118ff50d2653a63136196021e131f065df4c41 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:15:26 2011 +0200
Translation update done using Pootle.
commit 65cbb90eee500e21c2356848b267009db87865b3 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:14:59 2011 +0200
Translation update done using Pootle.
commit 5900706ae7f9832bd4ebac91a36fc4a753a36d6f Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:14:34 2011 +0200
Translation update done using Pootle.
commit 7f4cd021732524e8c1fe96fe7b43cdaf6045b52b Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:12:27 2011 +0200
Translation update done using Pootle.
commit 204d9b8f4f8ae9c16cc5995e9cac492872fd1fcb Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:11:13 2011 +0200
Translation update done using Pootle.
commit f072a8fe0129a2ed4a099d976b061735aab9394a Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:10:50 2011 +0200
Translation update done using Pootle.
commit 248bb3f265ae224a705950d9e49c99b3f29b8f62 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:10:15 2011 +0200
Translation update done using Pootle.
commit 6b939bae63b214c2c3f3a39a8f88aad405bb9fda Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:08:44 2011 +0200
Translation update done using Pootle.
commit f163777cc8c83a70694af68b32ef20b988f307bc Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 20 22:07:44 2011 +0200
Translation update done using Pootle.
commit 5efda01d1f32598c28999d2916fb3276a39ab1d7 Author: shanyan baishui Siramizu@gmail.com Date: Thu Jan 20 03:47:01 2011 +0200
Translation update done using Pootle.
commit 321b0ab6f00d93b6886127466674b8da9e6bb1b2 Author: shanyan baishui Siramizu@gmail.com Date: Thu Jan 20 03:43:10 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/ru.po | 57 +++++++++++++++++++++++++++------------------------------ po/zh_CN.po | 9 ++++----- 2 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/po/ru.po b/po/ru.po index e7c1a98..2c0a6d0 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-17 21:41+0200\n" +"PO-Revision-Date: 2011-01-20 22:40+0200\n" "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n" "Language-Team: russian ru@li.org\n" "Language: ru\n" @@ -4327,46 +4327,49 @@ msgid "" "Textarea size (columns) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" msgstr "" +"Размер текстового поля в режиме редактирования (в столбцах); данное значение " +"будет приоритетным для текстовых полей SQL запроса (*2) и для окна запроса " +"(*1.25)"
#: libraries/config/messages.inc.php:474 -#, fuzzy #| msgid "CHAR textarea columns" msgid "Textarea columns" -msgstr "Ширина textarea для CHAR" +msgstr "Столбцов в текстовом поле"
#: libraries/config/messages.inc.php:475 msgid "" "Textarea size (rows) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" msgstr "" +"Размер текстового поля в режиме редактирования (в строках); данное значение " +"будет приоритетным для текстовых полей SQL запроса (*2) и для окна запроса " +"(*1.25)"
#: libraries/config/messages.inc.php:476 -#, fuzzy #| msgid "CHAR textarea rows" msgid "Textarea rows" -msgstr "Высота textarea для CHAR" +msgstr "Строк в текстовом поле"
#: libraries/config/messages.inc.php:477 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "Заголовок окна браузера при выборе базы данных"
#: libraries/config/messages.inc.php:479 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "Заголовок окна браузера по умолчанию"
#: libraries/config/messages.inc.php:480 -#, fuzzy #| msgid "Default table tab" msgid "Default title" -msgstr "Вкладка по умолчанию для таблицы" +msgstr "Заголовок по умолчанию"
#: libraries/config/messages.inc.php:481 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "Заголовок окна браузера при выборе сервера"
#: libraries/config/messages.inc.php:483 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "Заголовок окна браузера при выборе таблицы"
#: libraries/config/messages.inc.php:485 msgid "" @@ -4407,10 +4410,12 @@ msgid "" "When disabled, users cannot set any of the options below, regardless of the " "checkbox on the right" msgstr "" +"При отключении, пользователи не смогут установить никакие из указанных ниже " +"параметров, вне зависимости от галочки справа от них"
#: libraries/config/messages.inc.php:492 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Включение вкладки разработчика в настройках"
#: libraries/config/messages.inc.php:493 msgid "" @@ -4443,28 +4448,24 @@ msgid "ZIP" msgstr "ZIP"
#: libraries/config/setup.forms.php:41 -#, fuzzy #| msgid "Host authentication order" msgid "Config authentication" -msgstr "Порядок хостов для идентификации" +msgstr "Авторизация через конфигурационный файл"
#: libraries/config/setup.forms.php:45 -#, fuzzy #| msgid "Host authentication order" msgid "Cookie authentication" -msgstr "Порядок хостов для идентификации" +msgstr "Авторизация с помощью cookie"
#: libraries/config/setup.forms.php:48 -#, fuzzy #| msgid "Host authentication order" msgid "HTTP authentication" -msgstr "Порядок хостов для идентификации" +msgstr "Авторизация с помощью HTTP"
#: libraries/config/setup.forms.php:51 -#, fuzzy #| msgid "Host authentication order" msgid "Signon authentication" -msgstr "Порядок хостов для идентификации" +msgstr "Авторизация с помощью Signon"
#: libraries/config/setup.forms.php:238 #: libraries/config/user_preferences.forms.php:142 libraries/import/ldi.php:34 @@ -4495,14 +4496,13 @@ msgstr "Open Document Spreadsheet" #: libraries/config/setup.forms.php:260 #: libraries/config/user_preferences.forms.php:163 msgid "Quick" -msgstr "" +msgstr "Быстро"
#: libraries/config/setup.forms.php:264 #: libraries/config/user_preferences.forms.php:167 -#, fuzzy #| msgid "Custom color" msgid "Custom" -msgstr "Выбрать цвет" +msgstr "Обычно"
#: libraries/config/setup.forms.php:285 #: libraries/config/user_preferences.forms.php:187 @@ -4566,7 +4566,7 @@ msgstr "Некорректно введен IP адрес: %s" #: libraries/core.lib.php:262 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "" +msgstr "Расширение %s не найдено. Пожалуйста, проверьте ваши настройки PHP."
#: libraries/db_events.inc.php:14 libraries/db_events.inc.php:16 #: libraries/export/sql.php:481 @@ -4658,10 +4658,9 @@ msgid "Password Hashing" msgstr "Хеширование пароля"
#: libraries/display_change_password.lib.php:65 -#, fuzzy #| msgid "MySQL 4.0 compatible" msgid "MySQL 4.0 compatible" -msgstr "MySQL 4.0 совместимо" +msgstr "Совместимо с MySQL 4.0"
#: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 @@ -4683,10 +4682,9 @@ msgid "Create table on database %s" msgstr "Создать новую таблицу в базе данных %s"
#: libraries/display_create_table.lib.php:55 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" -msgstr "Количество полей" +msgstr "Количество столбцов"
#: libraries/display_export.lib.php:35 msgid "Could not load export plugins, please check your installation!" @@ -4695,10 +4693,9 @@ msgstr "" "установленной копии phpMyAdmin."
#: libraries/display_export.lib.php:87 -#, fuzzy #| msgid "Allows locking tables for the current thread." msgid "Exporting databases from the current server" -msgstr "Разрешает блокировку таблиц для текущего потока" +msgstr "Экспорт баз данных с текущего сервера"
#: libraries/display_export.lib.php:89 #, fuzzy, php-format diff --git a/po/zh_CN.po b/po/zh_CN.po index 057073e..f6c22fc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,13 +4,13 @@ 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: 2010-12-30 05:04+0200\n" +"PO-Revision-Date: 2011-01-20 03:47+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: chinese_simplified zh_CN@li.org\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n"
@@ -4453,10 +4453,9 @@ msgid "bzipped" msgstr "bzip 压缩"
#: libraries/display_export.lib.php:326 -#, fuzzy #| msgid "Save output to a file" msgid "View output as text" -msgstr "保存为文件" +msgstr "直接显示为文本"
#: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:37 @@ -4471,7 +4470,7 @@ msgstr "格式特定选项：" msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." -msgstr "" +msgstr "请下拉至所选格式并设置选项，其它格式请忽略。"
#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260 msgid "Encoding Conversion:"
hooks/post-receive