[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1721-gbfb6bbb - Git

6 Feb 2011

The branch, master has been updated
       via  bfb6bbb9426158427d0c9b7632c2b8619d07f055 (commit)
       via  26cf21aa901067f6eec802de00471075c5c763c9 (commit)
       via  fcc359057bc0983b41823db51ed227fce4895c09 (commit)
       via  7a78668ded2fa397a997f0fb77a2e2cb254f41c9 (commit)
       via  d4485a2d1854a2dc30592e2bbfbd75f07d1f56b3 (commit)
       via  fe100b07cb74f7d25d8abbb70d6005502b81d0a9 (commit)
       via  2e785bbbb94915eb45da5c47f8f65b46117a959c (commit)
       via  169ba958967eeeca707dcdda1bd40f2b11f49cfc (commit)
       via  d69a8a9bdad0a4aa6d9be02eb27fcfd325c132fe (commit)
       via  76df49ed993118bfcdb2c88f0c6323a57ad91a5d (commit)
       via  76f529b7c37ae063c48bd19b1dd2ba5a85e4e0f9 (commit)
       via  4fe3030a17b556634230b0b028d55a7d53f8a1db (commit)
       via  3cf187bf58f3e9a9a5014d4839db62f0252cf69b (commit)
       via  a63ffe5f1031c941fc40e0b89c20e4cd8a06ae11 (commit)
       via  71c2def18396ae29004ae0dddc44978605beb0bb (commit)
       via  78213f3971315f94843d74fa2c5aab3d880c7612 (commit)
       via  c14331479f70fc62496ee9207014063da2905e66 (commit)
       via  b4ae22e347d818184968697da04958d21bd057a6 (commit)
       via  5ee4141171a50c9a1da22da7f21da7db81294fbe (commit)
       via  8e95c43935080e74db893cea1d4012d2b723d23d (commit)
       via  6931696372d582790b113c84919114a97cc0e0a6 (commit)
       via  535fa2388232970b6543630975f797c4095fc4a5 (commit)
       via  c9c9f75ea31e67988c70dc0c9fec263a86596513 (commit)
       via  591fce5f8c3073fb78d9376e0261a6e4943dae37 (commit)
       via  ea340f7421331f0127d17882c9e4ab68d5032f91 (commit)
       via  c43a984ecadb56f85fefdc0fbe5edf62774c2ba3 (commit)
       via  36586f0d41c26e0b68995862bc3898f559e074f7 (commit)
       via  d88bfe29fc18b086ce495db95d3c4a52718cf235 (commit)
       via  66813718db68adf780d215f07b8d3c9ecbefe417 (commit)
       via  be58412e1c72bd4f8198ebff9d92b38de689de80 (commit)
       via  f8ad67750d94f81e21e8d88164bd72db3bb71522 (commit)
       via  37c7bcb4af0cc502f46643c3e10ae29878371009 (commit)
       via  e787b2f535efbfcf9c7ed7f73a5dac1326898567 (commit)
       via  6843e575f3799652f129268fb67fd04ca80beef5 (commit)
       via  ca6eaaea09fe017ff1640291f5b143fe23f0f479 (commit)
       via  9110e0e0216e5f0ce23e321f81c8103525316ab9 (commit)
       via  7a8d96fcca054fe9cd0bf24c1ae76087ea3e6653 (commit)
      from  5272fd6dab525808958feaf5a275addc23b7dda7 (commit)
- Log -----------------------------------------------------------------
commit bfb6bbb9426158427d0c9b7632c2b8619d07f055
Merge: 26cf21aa901067f6eec802de00471075c5c763c9 5272fd6dab525808958feaf5a275addc23b7dda7
Author: Pootle server pootle@cihar.com
Date:   Sun Feb 6 06:40:25 2011 +0100
Merge remote branch 'origin/master'
commit 26cf21aa901067f6eec802de00471075c5c763c9
Merge: fcc359057bc0983b41823db51ed227fce4895c09 98df129296c83ebe51e7c484c7d57ee31f19e115
Author: Pootle server pootle@cihar.com
Date:   Sat Feb 5 22:40:29 2011 +0100
Merge remote branch 'origin/master'
commit fcc359057bc0983b41823db51ed227fce4895c09
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:16:32 2011 +0200
Translation update done using Pootle.
commit 7a78668ded2fa397a997f0fb77a2e2cb254f41c9
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:15:35 2011 +0200
Translation update done using Pootle.
commit d4485a2d1854a2dc30592e2bbfbd75f07d1f56b3
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:13:40 2011 +0200
Translation update done using Pootle.
commit fe100b07cb74f7d25d8abbb70d6005502b81d0a9
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:13:25 2011 +0200
Translation update done using Pootle.
commit 2e785bbbb94915eb45da5c47f8f65b46117a959c
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:13:01 2011 +0200
Translation update done using Pootle.
commit 169ba958967eeeca707dcdda1bd40f2b11f49cfc
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:12:44 2011 +0200
Translation update done using Pootle.
commit d69a8a9bdad0a4aa6d9be02eb27fcfd325c132fe
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:10:16 2011 +0200
Translation update done using Pootle.
commit 76df49ed993118bfcdb2c88f0c6323a57ad91a5d
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:09:42 2011 +0200
Translation update done using Pootle.
commit 76f529b7c37ae063c48bd19b1dd2ba5a85e4e0f9
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:09:19 2011 +0200
Translation update done using Pootle.
commit 4fe3030a17b556634230b0b028d55a7d53f8a1db
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:09:08 2011 +0200
Translation update done using Pootle.
commit 3cf187bf58f3e9a9a5014d4839db62f0252cf69b
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:06:04 2011 +0200
Translation update done using Pootle.
commit a63ffe5f1031c941fc40e0b89c20e4cd8a06ae11
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:05:28 2011 +0200
Translation update done using Pootle.
commit 71c2def18396ae29004ae0dddc44978605beb0bb
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:04:00 2011 +0200
Translation update done using Pootle.
commit 78213f3971315f94843d74fa2c5aab3d880c7612
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:03:19 2011 +0200
Translation update done using Pootle.
commit c14331479f70fc62496ee9207014063da2905e66
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:02:10 2011 +0200
Translation update done using Pootle.
commit b4ae22e347d818184968697da04958d21bd057a6
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 22:01:09 2011 +0200
Translation update done using Pootle.
commit 5ee4141171a50c9a1da22da7f21da7db81294fbe
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:59:28 2011 +0200
Translation update done using Pootle.
commit 8e95c43935080e74db893cea1d4012d2b723d23d
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:59:20 2011 +0200
Translation update done using Pootle.
commit 6931696372d582790b113c84919114a97cc0e0a6
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:58:00 2011 +0200
Translation update done using Pootle.
commit 535fa2388232970b6543630975f797c4095fc4a5
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:57:41 2011 +0200
Translation update done using Pootle.
commit c9c9f75ea31e67988c70dc0c9fec263a86596513
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:56:28 2011 +0200
Translation update done using Pootle.
commit 591fce5f8c3073fb78d9376e0261a6e4943dae37
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:56:10 2011 +0200
Translation update done using Pootle.
commit ea340f7421331f0127d17882c9e4ab68d5032f91
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:55:22 2011 +0200
Translation update done using Pootle.
commit c43a984ecadb56f85fefdc0fbe5edf62774c2ba3
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:55:17 2011 +0200
Translation update done using Pootle.
commit 36586f0d41c26e0b68995862bc3898f559e074f7
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:52:22 2011 +0200
Translation update done using Pootle.
commit d88bfe29fc18b086ce495db95d3c4a52718cf235
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:52:04 2011 +0200
Translation update done using Pootle.
commit 66813718db68adf780d215f07b8d3c9ecbefe417
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:51:11 2011 +0200
Translation update done using Pootle.
commit be58412e1c72bd4f8198ebff9d92b38de689de80
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:50:18 2011 +0200
Translation update done using Pootle.
commit f8ad67750d94f81e21e8d88164bd72db3bb71522
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:49:45 2011 +0200
Translation update done using Pootle.
commit 37c7bcb4af0cc502f46643c3e10ae29878371009
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:47:29 2011 +0200
Translation update done using Pootle.
commit e787b2f535efbfcf9c7ed7f73a5dac1326898567
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:47:09 2011 +0200
Translation update done using Pootle.
commit 6843e575f3799652f129268fb67fd04ca80beef5
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:40:48 2011 +0200
Translation update done using Pootle.
commit ca6eaaea09fe017ff1640291f5b143fe23f0f479
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:38:19 2011 +0200
Translation update done using Pootle.
commit 9110e0e0216e5f0ce23e321f81c8103525316ab9
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:37:44 2011 +0200
Translation update done using Pootle.
commit 7a8d96fcca054fe9cd0bf24c1ae76087ea3e6653
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Sat Feb 5 21:36:41 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/ru.po |   75 ++++++++++++++++++++++++++++---------------------------------
 1 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index d336b85..a39b1bc 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-04 23:50+0200\n"
+"PO-Revision-Date: 2011-02-05 22:16+0200\n"
 "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n"
 "Language-Team: russian ru@li.org\n"
 "Language: ru\n"
@@ -5823,28 +5823,27 @@ msgid "This plugin does not support compressed imports!"
 msgstr "Этот модуль не поддерживает импорт сжатых данных!"
#: libraries/import/ods.php:28
-#, fuzzy
 #| msgid "Import percentages as proper decimals (12.00% to .12)"
 msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>"
-msgstr "Импортировать проценты в виде десятичных значений (12.00% в .12)"
+msgstr ""
+"Импортировать проценты в виде десятичных значений <i>(напр. 12.00% в "
+".12)</i>"
#: libraries/import/ods.php:29
-#, fuzzy
 #| msgid "Import currencies ($5.00 to 5.00)"
 msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>"
-msgstr "Импортировать денежные единицы ($5.00 в 5.00)"
+msgstr "Импортировать денежные единицы <i>(напр. $5.00 в 5.00)</i>"
#: libraries/import/sql.php:32
-#, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
-msgstr "Режим совместимости SQL"
+msgstr "Режим совместимости SQL:"
#: libraries/import/sql.php:42
-#, fuzzy
 #| msgid "Do not use AUTO_INCREMENT for zero values"
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
-msgstr "Не используйте параметр AUTO_INCREMENT для нулевых значений"
+msgstr ""
+"Не использовать атрибут <code>AUTO_INCREMENT</code> для нулевых значений"
#: libraries/import/xml.php:74 libraries/import/xml.php:130
 msgid ""
@@ -5855,7 +5854,6 @@ msgstr ""
 "попробуйте ещё раз."
#: libraries/kanji-encoding.lib.php:142
-#, fuzzy
 #| msgid "None"
 msgctxt "None encoding conversion"
 msgid "None"
@@ -5864,7 +5862,7 @@ msgstr "Нет"
 #. l10n: This is currently used only in Japanese locales
 #: libraries/kanji-encoding.lib.php:148
 msgid "Convert to Kana"
-msgstr ""
+msgstr "Конвертировать в Кану"
#: libraries/mult_submits.inc.php:75 libraries/tbl_properties.inc.php:516
 #: tbl_structure.php:28 tbl_structure.php:152 tbl_structure.php:156
@@ -6095,12 +6093,10 @@ msgstr "Выход"
 #: libraries/navigation_header.inc.php:111
 #: libraries/navigation_header.inc.php:112
 #: libraries/navigation_header.inc.php:114
-#, fuzzy
 msgid "Reload navigation frame"
-msgstr "Модифицировать фрейм навигации"
+msgstr "Обновить фрейм навигации"
#: libraries/plugin_interface.lib.php:336
-#, fuzzy
 #| msgid "This format has no options"
 msgid "This format has no options"
 msgstr "Для этого формата нет настраиваемых параметров"
@@ -6146,30 +6142,36 @@ msgstr "История SQL-запросов"
#: libraries/relation.lib.php:147
 msgid "User preferences"
-msgstr ""
+msgstr "Пользовательские настройки"
#: libraries/relation.lib.php:151
 msgid "Quick steps to setup advanced features:"
-msgstr ""
+msgstr "Шаги необходимые для установки дополнительных функций:"
#: libraries/relation.lib.php:153
 msgid ""
 "Create the needed tables with the <code>script/create_tables.sql</code>."
 msgstr ""
+"Создайте необходимые таблицы с помощью скрипта "
+"<code>script/create_tables.sql</code>."
#: libraries/relation.lib.php:154
 msgid "Create a pma user and give access to these tables."
-msgstr ""
+msgstr "Создайте пользователя pma и предоставьте доступ к этим таблицам."
#: libraries/relation.lib.php:155
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
+"Подключите дополнительные функции в конфигурационном файле "
+"(<code>config.inc.php</code>), начните с примера в "
+"<code>config.sample.inc.php</code>."
#: libraries/relation.lib.php:156
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
+"Перезайдите в phpMyAdmin, чтобы загрузить обновленный конфигурационный файл."
#: libraries/relation.lib.php:1179
 msgid "no description"
@@ -6279,10 +6281,10 @@ msgstr "Создать пароль"
 #: libraries/schema/Pdf_Relation_Schema.class.php:487
 #: libraries/schema/Svg_Relation_Schema.class.php:369
 #: libraries/schema/Visio_Relation_Schema.class.php:213
-#, fuzzy, php-format
+#, php-format
 #| msgid "The "%s" table doesn't exist!"
 msgid "The %s table doesn't exist!"
-msgstr "Таблица "%s" не существует!"
+msgstr "Таблица %s не существует!"
#: libraries/schema/Dia_Relation_Schema.class.php:253
 #: libraries/schema/Eps_Relation_Schema.class.php:441
@@ -6297,20 +6299,19 @@ msgstr "Измените координаты таблицы %s"
 #: libraries/schema/Pdf_Relation_Schema.class.php:849
 #: libraries/schema/Svg_Relation_Schema.class.php:737
 #: libraries/schema/Visio_Relation_Schema.class.php:502
-#, fuzzy, php-format
+#, php-format
 #| msgid "Schema of the "%s" database - Page %s"
 msgid "Schema of the %s database - Page %s"
-msgstr "Структура базы данных "%s" - Страница %s"
+msgstr "Схема базы данных %s - Страница %s"
#: libraries/schema/Export_Relation_Schema.class.php:174
-#, fuzzy
 #| msgid "File %s does not contain any key id"
 msgid "This page does not contain any tables!"
-msgstr "Файл %s не содержит ключа идентификации"
+msgstr "Данная страница не содержит таблиц!"
#: libraries/schema/Export_Relation_Schema.class.php:207
 msgid "SCHEMA ERROR: "
-msgstr ""
+msgstr "Ошибка при создании схемы:"
#: libraries/schema/Pdf_Relation_Schema.class.php:874
 #: libraries/schema/Pdf_Relation_Schema.class.php:1113
@@ -6339,16 +6340,14 @@ msgid "Create a page"
 msgstr "Создать новую страницу"
#: libraries/schema/User_Schema.class.php:99
-#, fuzzy
 #| msgid "Page number:"
 msgid "Page name"
-msgstr "Номер страницы:"
+msgstr "Название страницы"
#: libraries/schema/User_Schema.class.php:103
-#, fuzzy
 #| msgid "Automatic layout"
 msgid "Automatic layout based on"
-msgstr "Автоматическая раскладка"
+msgstr "Основание автоматической раскладки"
#: libraries/schema/User_Schema.class.php:106
 msgid "Internal relations"
@@ -6356,31 +6355,29 @@ msgstr "Внутренние связи"
#: libraries/schema/User_Schema.class.php:116
 msgid "FOREIGN KEY"
-msgstr ""
+msgstr "FOREIGN KEY"
#: libraries/schema/User_Schema.class.php:148
 msgid "Please choose a page to edit"
 msgstr "Выбор страницы для редактирования"
#: libraries/schema/User_Schema.class.php:153
-#, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
-msgstr "Выберите таблицы"
+msgstr "Выберите страницу"
#: libraries/schema/User_Schema.class.php:211
 msgid "Select Tables"
 msgstr "Выберите таблицы"
#: libraries/schema/User_Schema.class.php:346
-#, fuzzy
 #| msgid "Relational schema"
 msgid "Display relational schema"
-msgstr "Cхема связей"
+msgstr "Отобразить схему связей"
#: libraries/schema/User_Schema.class.php:356
 msgid "Select Export Relational Type"
-msgstr ""
+msgstr "Выберите тип экспорта связей"
#: libraries/schema/User_Schema.class.php:377
 msgid "Show grid"
@@ -6411,10 +6408,9 @@ msgid "Portrait"
 msgstr "Книжная"
#: libraries/schema/User_Schema.class.php:394
-#, fuzzy
 #| msgid "Creation"
 msgid "Orientation"
-msgstr "Создание"
+msgstr "Ориентация"
#: libraries/schema/User_Schema.class.php:407
 msgid "Paper size"
@@ -6444,7 +6440,6 @@ msgid "Unknown language: %1$s."
 msgstr "Неизвестный язык: %1$s."
#: libraries/select_server.lib.php:38 libraries/select_server.lib.php:44
-#, fuzzy
 #| msgid "Current server"
 msgid "Current Server"
 msgstr "Текущий сервер"
@@ -6477,10 +6472,9 @@ msgid "Synchronize"
 msgstr "Синхронизировать"
#: libraries/server_links.inc.php:99
-#, fuzzy
 #| msgid "settings"
 msgid "Settings"
-msgstr "настройки"
+msgstr "Настройки"
#: libraries/server_synchronize.lib.php:1337 server_synchronize.php:1108
 msgid "Source database"
@@ -6515,10 +6509,9 @@ msgid "Run SQL query/queries on database %s"
 msgstr "Выполнить SQL-запрос(ы) к базе данных %s"
#: libraries/sql_query_form.lib.php:301
-#, fuzzy
 #| msgid "Column names"
 msgid "Columns"
-msgstr "Названия столбцов"
+msgstr "Столбцы"
#: libraries/sql_query_form.lib.php:336 sql.php:854 sql.php:855 sql.php:872
 msgid "Bookmark this SQL query"
hooks/post-receive
-- 
phpMyAdmin


    