[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1443-g6ca2a7b - Git

25 Jan 2011

The branch, master has been updated
       via  6ca2a7bef3d7485c36264fea962a14a41d621287 (commit)
       via  42391e93e0af136d6904ce6d09c3151c768a6d6f (commit)
       via  839ed0d0e593bdf11ab4e210bba88d50f4c1490a (commit)
       via  549c553ffd9a64c29d7848f5c0ef1e5b40182c8a (commit)
       via  89a1b0182897710cca03d7154798e04fb5448ee6 (commit)
       via  8b2cd394e4306719ada717c6b9755e5238fb7453 (commit)
       via  b5f10ba027618086c74561202143e6ea3e9faf7a (commit)
       via  1ac47de703c1eea218b204fb9e25d069dc819199 (commit)
       via  5598ebc30ac6377a84f76f301926838161f85da1 (commit)
       via  fbcfc43e39e33c75e184bed5ec38410a43833eea (commit)
       via  8a6fc82d1b27c1ad7bd5828e253e2fb99f2d66f4 (commit)
       via  dd4a017d1772176e37a6003fc6d40241a6a9deff (commit)
       via  3e54ce11ee651dfb44f44794eadfd329cdc399d6 (commit)
       via  a5217264e4cfe41e28d8d900a6272f335bab9458 (commit)
       via  2da46147af736a6ba9118a13beb9dc6088730fb5 (commit)
       via  14f2964762aeacd7004c3d5dcb0b9867b6348d0a (commit)
       via  eaa2e559d990dedaccdbf9ad1632be05771cf5a6 (commit)
       via  08d80af5610b7896fb9de05a1fdc4969b7627559 (commit)
       via  d435a47d48d48e1536873c5860635b966a89cfa6 (commit)
       via  93613aec4770cc659209ce35c09f54d4f329f389 (commit)
       via  8f528b379694a47dc79e08a911ccf922d34cba27 (commit)
       via  a20d341508223773f36823d56042713fa7e10c3c (commit)
       via  0a9081eadac148361da974b9d64e3c7b09d5c29f (commit)
       via  e3e1575bb9fe454af48827894e6e4c73fb437272 (commit)
       via  fc799390e0e609b22ae158aae24c17c6b37edff8 (commit)
       via  d7d58782936fbf9ff6c7485f404f6bb491699ced (commit)
       via  06ee78d85d2ee1217d9b6a29ee65d17d7bacc4d2 (commit)
       via  a151eea29db61a575596ef94b8fb4ff6db0ea9fb (commit)
       via  0809f9f01997299dd4445db762c19e0c71111ddc (commit)
       via  bfac9a97ac4288e2779699f126d66eb0f460ffa6 (commit)
       via  77d34e3d2acae41b4293caf2cd7e9a2a680fb129 (commit)
       via  22bf420d4ea053010db0574d7c9d2ca135d40543 (commit)
       via  fff3aca97d6438e320d9937c97c3b778cb3a2d17 (commit)
       via  a361487148da36a50195ad1099143d98b2ff846a (commit)
       via  0b920de418b8111e6a9fc6f338ca4bf675a7cfb3 (commit)
       via  9b74786d115edad026875da142ede82a4cd20de3 (commit)
       via  da439b6b18a42040b44e413b765c67c2999ecaaa (commit)
       via  4b96ebd3719087ef28fc186f699ce8387d4f88fd (commit)
      from  e3870e938edabc3cdd0f5c71fd9a2a87359f3271 (commit)
- Log -----------------------------------------------------------------
commit 6ca2a7bef3d7485c36264fea962a14a41d621287
Merge: 42391e93e0af136d6904ce6d09c3151c768a6d6f e3870e938edabc3cdd0f5c71fd9a2a87359f3271
Author: Pootle server pootle@cihar.com
Date:   Tue Jan 25 04:40:31 2011 +0100
Merge remote branch 'origin/master'
commit 42391e93e0af136d6904ce6d09c3151c768a6d6f
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 23:01:00 2011 +0200
Translation update done using Pootle.
commit 839ed0d0e593bdf11ab4e210bba88d50f4c1490a
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:58:04 2011 +0200
Translation update done using Pootle.
commit 549c553ffd9a64c29d7848f5c0ef1e5b40182c8a
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:56:41 2011 +0200
Translation update done using Pootle.
commit 89a1b0182897710cca03d7154798e04fb5448ee6
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:55:09 2011 +0200
Translation update done using Pootle.
commit 8b2cd394e4306719ada717c6b9755e5238fb7453
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:54:56 2011 +0200
Translation update done using Pootle.
commit b5f10ba027618086c74561202143e6ea3e9faf7a
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:54:38 2011 +0200
Translation update done using Pootle.
commit 1ac47de703c1eea218b204fb9e25d069dc819199
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:54:33 2011 +0200
Translation update done using Pootle.
commit 5598ebc30ac6377a84f76f301926838161f85da1
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:54:28 2011 +0200
Translation update done using Pootle.
commit fbcfc43e39e33c75e184bed5ec38410a43833eea
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:54:05 2011 +0200
Translation update done using Pootle.
commit 8a6fc82d1b27c1ad7bd5828e253e2fb99f2d66f4
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:53:36 2011 +0200
Translation update done using Pootle.
commit dd4a017d1772176e37a6003fc6d40241a6a9deff
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:53:10 2011 +0200
Translation update done using Pootle.
commit 3e54ce11ee651dfb44f44794eadfd329cdc399d6
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:52:05 2011 +0200
Translation update done using Pootle.
commit a5217264e4cfe41e28d8d900a6272f335bab9458
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:51:16 2011 +0200
Translation update done using Pootle.
commit 2da46147af736a6ba9118a13beb9dc6088730fb5
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:51:05 2011 +0200
Translation update done using Pootle.
commit 14f2964762aeacd7004c3d5dcb0b9867b6348d0a
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:50:54 2011 +0200
Translation update done using Pootle.
commit eaa2e559d990dedaccdbf9ad1632be05771cf5a6
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:50:48 2011 +0200
Translation update done using Pootle.
commit 08d80af5610b7896fb9de05a1fdc4969b7627559
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:48:56 2011 +0200
Translation update done using Pootle.
commit d435a47d48d48e1536873c5860635b966a89cfa6
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:48:19 2011 +0200
Translation update done using Pootle.
commit 93613aec4770cc659209ce35c09f54d4f329f389
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:48:00 2011 +0200
Translation update done using Pootle.
commit 8f528b379694a47dc79e08a911ccf922d34cba27
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:46:40 2011 +0200
Translation update done using Pootle.
commit a20d341508223773f36823d56042713fa7e10c3c
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:46:35 2011 +0200
Translation update done using Pootle.
commit 0a9081eadac148361da974b9d64e3c7b09d5c29f
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:45:49 2011 +0200
Translation update done using Pootle.
commit e3e1575bb9fe454af48827894e6e4c73fb437272
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:41:21 2011 +0200
Translation update done using Pootle.
commit fc799390e0e609b22ae158aae24c17c6b37edff8
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:41:14 2011 +0200
Translation update done using Pootle.
commit d7d58782936fbf9ff6c7485f404f6bb491699ced
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:39:44 2011 +0200
Translation update done using Pootle.
commit 06ee78d85d2ee1217d9b6a29ee65d17d7bacc4d2
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:39:28 2011 +0200
Translation update done using Pootle.
commit a151eea29db61a575596ef94b8fb4ff6db0ea9fb
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:39:06 2011 +0200
Translation update done using Pootle.
commit 0809f9f01997299dd4445db762c19e0c71111ddc
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:32:29 2011 +0200
Translation update done using Pootle.
commit bfac9a97ac4288e2779699f126d66eb0f460ffa6
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:32:03 2011 +0200
Translation update done using Pootle.
commit 77d34e3d2acae41b4293caf2cd7e9a2a680fb129
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:31:52 2011 +0200
Translation update done using Pootle.
commit 22bf420d4ea053010db0574d7c9d2ca135d40543
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:28:00 2011 +0200
Translation update done using Pootle.
commit fff3aca97d6438e320d9937c97c3b778cb3a2d17
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:27:56 2011 +0200
Translation update done using Pootle.
commit a361487148da36a50195ad1099143d98b2ff846a
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:24:54 2011 +0200
Translation update done using Pootle.
commit 0b920de418b8111e6a9fc6f338ca4bf675a7cfb3
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:15:26 2011 +0200
Translation update done using Pootle.
commit 9b74786d115edad026875da142ede82a4cd20de3
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:14:24 2011 +0200
Translation update done using Pootle.
commit da439b6b18a42040b44e413b765c67c2999ecaaa
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:07:06 2011 +0200
Translation update done using Pootle.
commit 4b96ebd3719087ef28fc186f699ce8387d4f88fd
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Mon Jan 24 22:06:46 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/ru.po |   72 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 213954c..00be8f1 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-23 15:04+0200\n"
+"PO-Revision-Date: 2011-01-24 23:01+0200\n"
 "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n"
 "Language-Team: russian ru@li.org\n"
 "Language: ru\n"
@@ -5018,26 +5018,23 @@ msgid "Options"
 msgstr "Параметры"
#: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568
-#, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial texts"
-msgstr "Сокращенное отображение данных"
+msgstr "Сокращенные тексты"
#: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572
-#, fuzzy
 #| msgid "Full Texts"
 msgid "Full texts"
-msgstr "Развернутое отображение данных"
+msgstr "Полные тексты"
#: libraries/display_tbl.lib.php:585
 msgid "Relational key"
 msgstr "Ссылочный ключ"
#: libraries/display_tbl.lib.php:586
-#, fuzzy
 #| msgid "Relational display field"
 msgid "Relational display column"
-msgstr "Значение связанного поля"
+msgstr "Отображение связанного поля"
#: libraries/display_tbl.lib.php:593
 msgid "Show binary contents"
@@ -5098,10 +5095,9 @@ msgid "Print view (with full texts)"
 msgstr "Версия для печати (полностью)"
#: libraries/display_tbl.lib.php:2236 tbl_chart.php:81
-#, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
-msgstr "Показать PDF-схему"
+msgstr "Отобразить график"
#: libraries/display_tbl.lib.php:2386
 msgid "Link not found"
@@ -5298,20 +5294,16 @@ msgstr ""
 "ALTER TABLE."
#: libraries/engines/pbms.lib.php:30
-#, fuzzy
 #| msgid "Garbage threshold"
 msgid "Garbage Threshold"
 msgstr "Порог захламления"
#: libraries/engines/pbms.lib.php:31
-#, fuzzy
 #| msgid ""
 #| "The percentage of garbage in a data log file before it is compacted. This "
 #| "is a value between 1 and 99. The default is 50."
 msgid "The percentage of garbage in a repository file before it is compacted."
-msgstr ""
-"Процентное соотношение захламления в файле журнала данных до его компоновки. "
-"Значение между 1 и 99. Изначальное значение 50."
+msgstr "Процентное соотношение захламления в файле хранилища до его уплотнения."
#: libraries/engines/pbms.lib.php:35 libraries/replication_gui.lib.php:69
 #: server_synchronize.php:1161
@@ -5323,10 +5315,12 @@ msgid ""
 "The port for the PBMS stream-based communications. Setting this value to 0 "
 "will disable HTTP communication with the daemon."
 msgstr ""
+"Порт для PBMS поточных соединений. Установка этого значения равным 0 "
+"запретит HTTP соединение с процессом."
#: libraries/engines/pbms.lib.php:40
 msgid "Repository Threshold"
-msgstr ""
+msgstr "Порог хранилища"
#: libraries/engines/pbms.lib.php:41
 msgid ""
@@ -5334,22 +5328,27 @@ msgid ""
 "indicate the unit of the value. A value in bytes is assumed when no unit is "
 "specified."
 msgstr ""
+"Максимальный размер файла хранилища BLOB. Вы можете использовать Kb, MB или "
+"GB для обозначения единицы измерения. Отсутствие единицы измерения означает "
+"значение в байтах."
#: libraries/engines/pbms.lib.php:45
 msgid "Temp Blob Timeout"
-msgstr ""
+msgstr "Лимит временного BLOB"
#: libraries/engines/pbms.lib.php:46
 msgid ""
 "The timeout, in seconds, for temporary BLOBs. Uploaded BLOB data is removed "
 "after this time, unless they are referenced by a record in the database."
 msgstr ""
+"Интервал в секундах для временных BLOB данных. Загруженные BLOB данные "
+"удаляются по истечении этого времени, если на них не ссылаются записи в базе "
+"данных."
#: libraries/engines/pbms.lib.php:50
-#, fuzzy
 #| msgid "Log file threshold"
 msgid "Temp Log Threshold"
-msgstr "Порог файла журнала"
+msgstr "Порог временного журнала"
#: libraries/engines/pbms.lib.php:51
 msgid ""
@@ -5357,26 +5356,35 @@ msgid ""
 "indicate the unit of the value. A value in bytes is assumed when no unit is "
 "specified."
 msgstr ""
+"Максимальный размер временного файла журнала BLOB. Вы можете использовать "
+"Kb, MB или GB для обозначения единицы измерения. Отсутствие единицы "
+"измерения означает значение в байтах."
#: libraries/engines/pbms.lib.php:55
 msgid "Max Keep Alive"
-msgstr ""
+msgstr "Максимальное время жизни"
#: libraries/engines/pbms.lib.php:56
 msgid ""
 "The timeout for inactive connection with the keep-alive flag set. After this "
 "time the connection will be closed. The time-out is in milliseconds (1/1000)."
 msgstr ""
+"Временное ограничение для неактивных соединений с установленным флагом Keep-"
+"Alive. По истечении этого времени соединение будет закрыто. Лимит "
+"указывается в миллисекундах (1/1000)."
#: libraries/engines/pbms.lib.php:60
 msgid "Metadata Headers"
-msgstr ""
+msgstr "Заголовки метаданных"
#: libraries/engines/pbms.lib.php:61
 msgid ""
 "A ":" delimited list of metadata headers to be used to initialize the "
 "pbms_metadata_header table when a database is created."
 msgstr ""
+"Символ ":" разделяет список заголовков метаданных, которые будут "
+"использоваться для инициализации pbms_metadata_header таблицы при создании "
+"базы данных."
#: libraries/engines/pbxt.lib.php:22
 msgid "Index cache size"
@@ -5528,57 +5536,49 @@ msgstr ""
 "порядковый номер."
#: libraries/export/csv.php:21 libraries/import/csv.php:27
-#, fuzzy
 #| msgid "Lines terminated by"
 msgid "Columns separated with:"
-msgstr "Разделитель строк"
+msgstr "Разделитель полей:"
#: libraries/export/csv.php:22 libraries/import/csv.php:28
-#, fuzzy
 #| msgid "Fields enclosed by"
 msgid "Columns enclosed with:"
-msgstr "Значения полей обрамлены"
+msgstr "Значения полей обрамлены:"
#: libraries/export/csv.php:23 libraries/import/csv.php:29
-#, fuzzy
 #| msgid "Fields escaped by"
 msgid "Columns escaped with:"
-msgstr "Символ экранирования"
+msgstr "Символ экранирования:"
#: libraries/export/csv.php:24 libraries/import/csv.php:30
-#, fuzzy
 #| msgid "Lines terminated by"
 msgid "Lines terminated with:"
-msgstr "Разделитель строк"
+msgstr "Разделитель строк:"
#: libraries/export/csv.php:25 libraries/export/excel.php:22
 #: libraries/export/htmlword.php:28 libraries/export/latex.php:79
 #: libraries/export/ods.php:23 libraries/export/odt.php:59
 #: libraries/export/xls.php:23 libraries/export/xlsx.php:23
-#, fuzzy
 #| msgid "Replace NULL by"
 msgid "Replace NULL with:"
-msgstr "Заменить NULL на"
+msgstr "Заменить NULL на:"
#: libraries/export/csv.php:26 libraries/export/excel.php:23
-#, fuzzy
 #| msgid "Remove CRLF characters within fields"
 msgid "Remove carriage return/line feed characters within columns"
-msgstr "Удалите из полей символы CRLF"
+msgstr "Удалить из полей символы разрыва строк"
#: libraries/export/excel.php:32
-#, fuzzy
 #| msgid "Excel edition"
 msgid "Excel edition:"
-msgstr "Excel-версия"
+msgstr "Версия Excel:"
#: libraries/export/htmlword.php:27 libraries/export/latex.php:69
 #: libraries/export/odt.php:55 libraries/export/sql.php:132
 #: libraries/export/texytext.php:25 libraries/export/xml.php:45
-#, fuzzy
 #| msgid "Databases display options"
 msgid "Data dump options"
-msgstr "Параметры отображения списка баз данных"
+msgstr "Параметры сохранения данных"
#: libraries/export/htmlword.php:135 libraries/export/odt.php:175
 #: libraries/export/sql.php:946 libraries/export/texytext.php:123
hooks/post-receive
-- 
phpMyAdmin


    