[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1874-gb694a59 - Git

7 Feb 2011

The branch, master has been updated
       via  b694a590ddd216d09ff849d7b14591c65fc7ae4f (commit)
       via  e1a44c3e551c45143d6da799803cc51f5a34333a (commit)
       via  ab737f23cf3a5f9398af93e261d2eacba4a14581 (commit)
       via  7de647e8801979be40ff3827474e80e9c002b47b (commit)
       via  e7e3cee916afe296846262330f8958d6293c1776 (commit)
       via  e9ace2e64a7c454d708c16dc87344dd79716166e (commit)
       via  b8502a59ee2b0a869f72401d9c73a249832e8897 (commit)
       via  51fa84557e0b5cc331b221b2daa2352ec31a62fb (commit)
       via  ae7c6419fab59cad0c9e32e01ecbbffb8e461baa (commit)
       via  6d69caa8460dd4f82f5c5dfc30c297ac3cf312bc (commit)
       via  4609a0aa8d27e5aca4e014003293aca355b83cae (commit)
       via  98d5cf03077ba92fcd751b062cb7d9e94ec15926 (commit)
       via  df48e43f6700e5e2c1c364c811d44bbb74cfd611 (commit)
       via  1d6387e3ba8e12f597b8b6748860535a01b4176c (commit)
       via  3df42aa7e5c502e4a10f73f0ff5d7e2cdfc9aac5 (commit)
       via  20f62c25bb8955bfa7917fe96b7244618bce589c (commit)
       via  57324b22ffd479f4ed8f197f4fdd465b0c9d7c65 (commit)
       via  7f6614860fdeb7f99bf9b6ea6c502643d20a496d (commit)
       via  548dad5d218dffbcf3ccd56cdbbfcfd0f21134c6 (commit)
       via  0fad1e88817dee300131bced9b0f1d8d92a6c8fa (commit)
       via  f5c7038def71b25376ced680151e5e4b1132f326 (commit)
       via  0a5a134caefb65d4f1971b34ad18b143c9bccb2b (commit)
       via  632bd5a349b5e353500f16851e0663fc588d1231 (commit)
       via  0c945e064586458b19ce5eb7ec52a8c832e31e2b (commit)
       via  8696522ce74dd8e35fe690f35dc81dacb57ce713 (commit)
       via  56db1f51b61f4d4da13a5c621170a7ea47d10be5 (commit)
       via  3d8109ed9c765628ab8a5f544c09e2053269e5ed (commit)
       via  c3dabcb5f7969d26e4c199635507f657be416e14 (commit)
       via  9f3bd0cfd11f119297465a97c83c65f1b09ba4da (commit)
       via  e1469afc5f10a20fa0a508c0bf749f8acecbcc71 (commit)
       via  b4200943a1d527ae8c6e6eccd1d29f287842a6ac (commit)
       via  700172c876711d90200ab0d87fbfd6769246a140 (commit)
      from  148e35da06a5e6792bc15e23c4efc10c3f5f36c0 (commit)
- Log -----------------------------------------------------------------
commit b694a590ddd216d09ff849d7b14591c65fc7ae4f
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:34:08 2011 +0200
Translation update done using Pootle.
commit e1a44c3e551c45143d6da799803cc51f5a34333a
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:33:39 2011 +0200
Translation update done using Pootle.
commit ab737f23cf3a5f9398af93e261d2eacba4a14581
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:32:54 2011 +0200
Translation update done using Pootle.
commit 7de647e8801979be40ff3827474e80e9c002b47b
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:32:21 2011 +0200
Translation update done using Pootle.
commit e7e3cee916afe296846262330f8958d6293c1776
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:32:09 2011 +0200
Translation update done using Pootle.
commit e9ace2e64a7c454d708c16dc87344dd79716166e
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:31:38 2011 +0200
Translation update done using Pootle.
commit b8502a59ee2b0a869f72401d9c73a249832e8897
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:31:30 2011 +0200
Translation update done using Pootle.
commit 51fa84557e0b5cc331b221b2daa2352ec31a62fb
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:31:03 2011 +0200
Translation update done using Pootle.
commit ae7c6419fab59cad0c9e32e01ecbbffb8e461baa
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:30:52 2011 +0200
Translation update done using Pootle.
commit 6d69caa8460dd4f82f5c5dfc30c297ac3cf312bc
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:27:33 2011 +0200
Translation update done using Pootle.
commit 4609a0aa8d27e5aca4e014003293aca355b83cae
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:24:18 2011 +0200
Translation update done using Pootle.
commit 98d5cf03077ba92fcd751b062cb7d9e94ec15926
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:21:14 2011 +0200
Translation update done using Pootle.
commit df48e43f6700e5e2c1c364c811d44bbb74cfd611
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:20:55 2011 +0200
Translation update done using Pootle.
commit 1d6387e3ba8e12f597b8b6748860535a01b4176c
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:20:37 2011 +0200
Translation update done using Pootle.
commit 3df42aa7e5c502e4a10f73f0ff5d7e2cdfc9aac5
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:19:57 2011 +0200
Translation update done using Pootle.
commit 20f62c25bb8955bfa7917fe96b7244618bce589c
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:18:57 2011 +0200
Translation update done using Pootle.
commit 57324b22ffd479f4ed8f197f4fdd465b0c9d7c65
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:08:29 2011 +0200
Translation update done using Pootle.
commit 7f6614860fdeb7f99bf9b6ea6c502643d20a496d
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:08:05 2011 +0200
Translation update done using Pootle.
commit 548dad5d218dffbcf3ccd56cdbbfcfd0f21134c6
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:07:52 2011 +0200
Translation update done using Pootle.
commit 0fad1e88817dee300131bced9b0f1d8d92a6c8fa
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:07:03 2011 +0200
Translation update done using Pootle.
commit f5c7038def71b25376ced680151e5e4b1132f326
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:04:58 2011 +0200
Translation update done using Pootle.
commit 0a5a134caefb65d4f1971b34ad18b143c9bccb2b
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:04:40 2011 +0200
Translation update done using Pootle.
commit 632bd5a349b5e353500f16851e0663fc588d1231
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 22:01:50 2011 +0200
Translation update done using Pootle.
commit 0c945e064586458b19ce5eb7ec52a8c832e31e2b
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 21:58:39 2011 +0200
Translation update done using Pootle.
commit 8696522ce74dd8e35fe690f35dc81dacb57ce713
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 21:57:51 2011 +0200
Translation update done using Pootle.
commit 56db1f51b61f4d4da13a5c621170a7ea47d10be5
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 21:57:07 2011 +0200
Translation update done using Pootle.
commit 3d8109ed9c765628ab8a5f544c09e2053269e5ed
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 21:56:39 2011 +0200
Translation update done using Pootle.
commit c3dabcb5f7969d26e4c199635507f657be416e14
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 21:56:11 2011 +0200
Translation update done using Pootle.
commit 9f3bd0cfd11f119297465a97c83c65f1b09ba4da
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 21:55:53 2011 +0200
Translation update done using Pootle.
commit e1469afc5f10a20fa0a508c0bf749f8acecbcc71
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 21:52:53 2011 +0200
Translation update done using Pootle.
commit b4200943a1d527ae8c6e6eccd1d29f287842a6ac
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 21:48:40 2011 +0200
Translation update done using Pootle.
commit 700172c876711d90200ab0d87fbfd6769246a140
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Feb 7 21:46:45 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/ru.po |   87 +++++++++++++++++++++++++-------------------------------------
 1 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 2820da1..71bbdd1 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@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-02-02 15:32+0100\n"
-"PO-Revision-Date: 2011-02-06 21:59+0200\n"
+"PO-Revision-Date: 2011-02-07 22:34+0200\n"
 "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n"
 "Language-Team: russian ru@li.org\n"
 "Language: ru\n"
@@ -6932,16 +6932,17 @@ msgstr ""
 "хранения требуется подключение модуля %sхранения настроек phpMyAdmin%s."
#: libraries/user_preferences.lib.php:141
-#, fuzzy
 #| msgid "Cannot load or save configuration"
 msgid "Could not save configuration"
-msgstr "Невозможно загрузить или сохранить настройки"
+msgstr "Не получилось сохранить настройки"
#: libraries/user_preferences.lib.php:308
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
 "import it for current session?"
 msgstr ""
+"Ваш браузер содержит настройки phpMyAdmin для данного домена. Хотите "
+"импортировать их для текущей сессии?"
#: libraries/zip_extension.lib.php:25
 msgid "No files found inside ZIP archive!"
@@ -6953,34 +6954,31 @@ msgid "Error in ZIP archive:"
 msgstr "Ошибка в ZIP-архиве:"
#: main.php:68
-#, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
-msgstr "Основные возможности связей"
+msgstr "Основные настройки"
#: main.php:100
 msgid "MySQL connection collation"
 msgstr "Сопоставление соединения с MySQL"
#: main.php:116
-#, fuzzy
 #| msgid "Other core settings"
 msgid "Appearance Settings"
-msgstr "Другие настройки ядра"
+msgstr "Настройки внешнего вида"
#: main.php:136
 msgid "Background color"
-msgstr ""
+msgstr "Цвет фона"
#: main.php:137
 msgid "Choose..."
-msgstr ""
+msgstr "Выбрать..."
#: main.php:154 prefs_manage.php:274
-#, fuzzy
 #| msgid "settings"
 msgid "More settings"
-msgstr "настройки"
+msgstr "Дополнительные настройки"
#: main.php:171
 msgid "Protocol version"
@@ -7022,7 +7020,7 @@ msgstr "Официальная страница phpMyAdmin"
#: main.php:228
 msgid "Mailing lists"
-msgstr ""
+msgstr "Списки рассылки"
#: main.php:253
 msgid ""
@@ -7071,7 +7069,6 @@ msgstr ""
 "быстрее установленных."
#: main.php:284
-#, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
 #| "php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that "
@@ -7081,10 +7078,8 @@ msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
-"Ваш PHP параметр [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] меньше, чем длительность "
-"cookie определенная в phpMyAdmin, по этой причине, данные входа истекут "
-"быстрее установленных."
+"Параметр хранения cookie данных меньше, чем длительность cookie определенная "
+"в phpMyAdmin, по этой причине, данные входа истекут быстрее установленных."
#: main.php:292
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
@@ -7103,7 +7098,7 @@ msgstr ""
 "сразу после настройки phpMyAdmin."
#: main.php:309
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "The additional features for working with linked tables have been "
 #| "deactivated. To find out why click %shere%s."
@@ -7111,8 +7106,8 @@ msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. To find out why click %shere%s."
 msgstr ""
-"Дополнительные возможности для работы со связанными таблицами недоступны. "
-"Для определения причины нажмите %sздесь%s."
+"Дополнительные возможности phpMyAdmin не настроены в полной мере, некоторые "
+"функции были отключены. Для определения причины нажмите %sздесь%s."
#: main.php:324
 msgid ""
@@ -7120,6 +7115,9 @@ msgid ""
 "functionality will be missing. For example navigation frame will not refresh "
 "automatically."
 msgstr ""
+"Поддержка JavaScript в вашем браузере отсутствует или отключена, некоторые "
+"функции phpMyAdmin будет отсутствовать. Например, фрейм навигации не будет "
+"обновляться автоматически."
#: main.php:339
 #, php-format
@@ -7152,13 +7150,11 @@ msgid "Filter"
 msgstr "Фильтр"
#: navigation.php:277
-#, fuzzy
 #| msgid "table name"
 msgid "filter tables by name"
-msgstr "имя таблицы"
+msgstr "фильтровать таблицы по имени"
#: navigation.php:308 navigation.php:309
-#, fuzzy
 #| msgid "Create table"
 msgctxt "short form"
 msgid "Create table"
@@ -7217,10 +7213,9 @@ msgid "Import/Export coordinates for PDF schema"
 msgstr "Импорт/экспорт координат таблиц в/из PDF-схемы"
#: pmd_general.php:121
-#, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
-msgstr "Выполнить запрос"
+msgstr "Составить запрос"
#: pmd_general.php:126
 msgid "Move Menu"
@@ -7243,41 +7238,35 @@ msgid "Delete relation"
 msgstr "Удалить связь"
#: pmd_general.php:461 pmd_general.php:520
-#, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
-msgstr "Связь удалена"
+msgstr "Оператор"
#: pmd_general.php:471 pmd_general.php:530 pmd_general.php:653
 #: pmd_general.php:770
-#, fuzzy
 #| msgid "Export"
 msgid "Except"
-msgstr "Экспорт"
+msgstr "Кроме"
#: pmd_general.php:477 pmd_general.php:536 pmd_general.php:659
 #: pmd_general.php:776
-#, fuzzy
 #| msgid "in query"
 msgid "subquery"
-msgstr "по запросу"
+msgstr "подзапрос"
#: pmd_general.php:481 pmd_general.php:577
-#, fuzzy
 msgid "Rename to"
-msgstr "Переименовать таблицу в"
+msgstr "Переименовать в"
#: pmd_general.php:483 pmd_general.php:582
-#, fuzzy
 #| msgid "User name"
 msgid "New name"
-msgstr "Имя пользователя"
+msgstr "Новое имя"
#: pmd_general.php:486 pmd_general.php:701
-#, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
-msgstr "Создать"
+msgstr "Объединение"
#: pmd_general.php:488 pmd_general.php:508 pmd_general.php:630
 #: pmd_general.php:643 pmd_general.php:706 pmd_general.php:760
@@ -7286,10 +7275,9 @@ msgid "Operator"
 msgstr "Оператор"
#: pmd_general.php:811
-#, fuzzy
 #| msgid "Table options"
 msgid "Active options"
-msgstr "Параметры таблицы"
+msgstr "Активные параметры"
#: pmd_help.php:26
 msgid "To select relation, click :"
@@ -7297,7 +7285,6 @@ msgstr ""
 "Для выбора связи нажмите на точке соединения, как показано на картинке:"
#: pmd_help.php:28
-#, fuzzy
 #| msgid ""
 #| "The display field is shown in pink. To set/unset a field as the display "
 #| "field, click the "Choose field to display" icon, then click on the "
@@ -7307,36 +7294,32 @@ msgid ""
 "column, click the "Choose column to display" icon, then click on the "
 "appropriate column name."
 msgstr ""
-"Для того чтобы сделать столбец отображаемым, нажмите кнопку "Выбор "
-"отображаемого столбца" и выберите необходимый столбец. Отображаемые столбцы "
-"подсвечиваются розовым цветом."
+"Отображаемые столбцы подсвечиваются розовым цветом. Для того чтобы "
+"установить или снять отображаемый столбец, нажмите кнопку "Выбор "
+"отображаемого столбца" и выберите необходимый столбец."
#: pmd_pdf.php:34
-#, fuzzy
 msgid "Page has been created"
-msgstr "Таблица %1$s была создана."
+msgstr "Страница успешно создана"
#: pmd_pdf.php:37
 msgid "Page creation failed"
-msgstr ""
+msgstr "Ошибка создания страницы"
#: pmd_pdf.php:89
-#, fuzzy
 #| msgid "pages"
 msgid "Page"
-msgstr "страниц"
+msgstr "Страница"
#: pmd_pdf.php:99
-#, fuzzy
 #| msgid "Import files"
 msgid "Import from selected page"
-msgstr "Импорт файлов"
+msgstr "Импортировать с выбранной страницы"
#: pmd_pdf.php:100
-#, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Export to selected page"
-msgstr "Масштаб"
+msgstr "Экспортировать на выбранную страницу"
#: pmd_pdf.php:102
 #, fuzzy
hooks/post-receive
-- 
phpMyAdmin


    