The branch, master has been updated via 5ed2e7aa3531311654ceae7bab9842923473fd3e (commit) via 0944c1fee30d92e3c10acfca921864f4a177b7ea (commit) via 193c5261a6cfb56bc1c476604704847331af19be (commit) via 258b8c371f6214ab9d16cf81371604839bb37090 (commit) via 42e1895f64805a55fe06c13c90cd94b6d2eee93a (commit) via 48329e0df4e6e295218823c59e80c49f02d60c8f (commit) via 6e2defc90fc55a3b4fd88724d210c398c3e5376f (commit) via 3541d979567452ee3aa6539cb3e82aaba2153695 (commit) via 2911da9d2e8f3f3770f9c0bdb3e06806f8f804b1 (commit) via 3abad9d1db4e49891cc757a45e44c6a0e8bdedd0 (commit) via 7cddc0db10ae72a88dd720e779ad8b466ffb302e (commit) via 271ebb4c5b14132e0d05daa7f2613e341e642cae (commit) via 9196318e5d39e4a1207a10124d35e514f1551ce6 (commit) via f9fb1a44d24d9136f5fd0a5f1a7f0d8950c67674 (commit) via 7f1ff4c2bca1162c1cddef72d7897caaa87371fe (commit) via 001785de7a32774e3d75487f1df28a0405cfa32f (commit) via 331c5865ed99d1a3a6401e3a2835f4f7a493e3f6 (commit) via e7408daf8d7bd6c033f337a3baab60488da1f8a2 (commit) via 5ffa1a63a41f52593fcbe253de6766820ae51dc3 (commit) via 82c590667ba0509951da985f0682b4754f58dffd (commit) via 6bdb2bb934f871de931fb08b4000d1307809ff4c (commit) via 30a64604c0467bcbbc96464e875589f66342671a (commit) via dbac34d7d9bf271a949f64d14f61bb0970025408 (commit) via e44607ccbcd580998175338597780a95d9b5c450 (commit) via 7c6cec2568d913bf431a0c82c2e2d2403b17af75 (commit) via 74b41cb31a131e7127af1b26c5ed2981a4af92fa (commit) from a9c4feac0dfdd4215f3fd014423a0bc437be62fd (commit)
- Log ----------------------------------------------------------------- commit 5ed2e7aa3531311654ceae7bab9842923473fd3e Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 13 01:04:41 2011 +0200
Translation update done using Pootle.
commit 0944c1fee30d92e3c10acfca921864f4a177b7ea Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 13 01:03:30 2011 +0200
Translation update done using Pootle.
commit 193c5261a6cfb56bc1c476604704847331af19be Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 13 01:00:19 2011 +0200
Translation update done using Pootle.
commit 258b8c371f6214ab9d16cf81371604839bb37090 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 13 00:42:29 2011 +0200
Translation update done using Pootle.
commit 42e1895f64805a55fe06c13c90cd94b6d2eee93a Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 23:30:04 2011 +0200
Translation update done using Pootle.
commit 48329e0df4e6e295218823c59e80c49f02d60c8f Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 23:23:51 2011 +0200
Translation update done using Pootle.
commit 6e2defc90fc55a3b4fd88724d210c398c3e5376f Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 23:16:45 2011 +0200
Translation update done using Pootle.
commit 3541d979567452ee3aa6539cb3e82aaba2153695 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 23:13:52 2011 +0200
Translation update done using Pootle.
commit 2911da9d2e8f3f3770f9c0bdb3e06806f8f804b1 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 23:12:11 2011 +0200
Translation update done using Pootle.
commit 3abad9d1db4e49891cc757a45e44c6a0e8bdedd0 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 23:08:18 2011 +0200
Translation update done using Pootle.
commit 7cddc0db10ae72a88dd720e779ad8b466ffb302e Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 22:49:23 2011 +0200
Translation update done using Pootle.
commit 271ebb4c5b14132e0d05daa7f2613e341e642cae Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 22:35:32 2011 +0200
Translation update done using Pootle.
commit 9196318e5d39e4a1207a10124d35e514f1551ce6 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 22:32:43 2011 +0200
Translation update done using Pootle.
commit f9fb1a44d24d9136f5fd0a5f1a7f0d8950c67674 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 21:50:51 2011 +0200
Translation update done using Pootle.
commit 7f1ff4c2bca1162c1cddef72d7897caaa87371fe Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 21:50:01 2011 +0200
Translation update done using Pootle.
commit 001785de7a32774e3d75487f1df28a0405cfa32f Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 21:45:19 2011 +0200
Translation update done using Pootle.
commit 331c5865ed99d1a3a6401e3a2835f4f7a493e3f6 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 21:42:04 2011 +0200
Translation update done using Pootle.
commit e7408daf8d7bd6c033f337a3baab60488da1f8a2 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 21:41:32 2011 +0200
Translation update done using Pootle.
commit 5ffa1a63a41f52593fcbe253de6766820ae51dc3 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 21:39:38 2011 +0200
Translation update done using Pootle.
commit 82c590667ba0509951da985f0682b4754f58dffd Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 21:37:45 2011 +0200
Translation update done using Pootle.
commit 6bdb2bb934f871de931fb08b4000d1307809ff4c Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 21:36:52 2011 +0200
Translation update done using Pootle.
commit 30a64604c0467bcbbc96464e875589f66342671a Merge: dbac34d7d9bf271a949f64d14f61bb0970025408 a9c4feac0dfdd4215f3fd014423a0bc437be62fd Author: Pootle server pootle@cihar.com Date: Wed Jan 12 18:40:08 2011 +0100
Merge remote branch 'origin/master'
commit dbac34d7d9bf271a949f64d14f61bb0970025408 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 19:19:58 2011 +0200
Translation update done using Pootle.
commit e44607ccbcd580998175338597780a95d9b5c450 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 19:18:10 2011 +0200
Translation update done using Pootle.
commit 7c6cec2568d913bf431a0c82c2e2d2403b17af75 Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 19:17:36 2011 +0200
Translation update done using Pootle.
commit 74b41cb31a131e7127af1b26c5ed2981a4af92fa Author: Victor Volkov hanut@php-myadmin.ru Date: Wed Jan 12 19:16:41 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/ru.po | 64 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/po/ru.po b/po/ru.po index 297d8b7..022ff6d 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-12 19:04+0200\n" +"PO-Revision-Date: 2011-01-13 01:04+0200\n" "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n" "Language-Team: russian ru@li.org\n" "Language: ru\n" @@ -2211,24 +2211,22 @@ msgid "Custom - like above, but without the quick/custom choice" msgstr "По выбору - как выше, но без выбора быстро/по выбору"
#: libraries/config.values.php:119 -#, fuzzy #| msgid "Complete inserts" msgid "complete inserts" -msgstr "Полная вставка" +msgstr "полная вставка"
#: libraries/config.values.php:120 -#, fuzzy #| msgid "Extended inserts" msgid "extended inserts" -msgstr "Расширенные вставки" +msgstr "расширенная вставка"
#: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "оба верхних варианта"
#: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "иначе, чем в вариантах выше"
#: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:418 @@ -2255,7 +2253,7 @@ msgstr "Некорректное значение" #: libraries/config/validate.lib.php:460 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "Значение должно быть больше или равно %s"
#: libraries/config/FormDisplay.class.php:535 #, php-format @@ -2264,46 +2262,44 @@ msgstr "Отсутствуют данные для %s"
#: libraries/config/FormDisplay.class.php:727 #: libraries/config/FormDisplay.class.php:731 -#, fuzzy #| msgid "Variable" msgid "unavailable" -msgstr "Переменная" +msgstr "недоступно"
#: libraries/config/FormDisplay.class.php:728 #: libraries/config/FormDisplay.class.php:732 #, php-format msgid ""%s" requires %s extension" -msgstr "" +msgstr "Для "%s" требуется расширение %s"
#: libraries/config/FormDisplay.class.php:746 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "импорт не будет функционировать без функции (%s)"
#: libraries/config/FormDisplay.class.php:750 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "экспорт не будет функционировать без функции (%s)"
#: libraries/config/FormDisplay.class.php:757 msgid "SQL Validator is disabled" -msgstr "" +msgstr "SQL валидатор отключен"
#: libraries/config/FormDisplay.class.php:764 -#, fuzzy #| msgid "PHP extension to use" msgid "SOAP extension not found" -msgstr "PHP расширение" +msgstr "Не найдено расширение SOAP"
#: libraries/config/FormDisplay.class.php:772 -#, fuzzy, php-format +#, php-format #| msgid "Maximum tables" msgid "maximum %s" -msgstr "Максимальное количество таблиц" +msgstr "максимум %s"
#: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" -msgstr "" +msgstr "Эта настройка отключена и не будет применена при конфигурации"
#: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:83 #: libraries/relation.lib.php:90 pmd_relation_new.php:68 @@ -2322,7 +2318,7 @@ msgstr "Восстановить изначальное значение"
#: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Разрешить пользователям изменять данное значение"
#: libraries/config/FormDisplay.tpl.php:332 #: libraries/schema/User_Schema.class.php:317 @@ -2355,10 +2351,14 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"Включение данного параметра позволяет странице расположенной на другом " +"домене вызвать phpMyAdmin внутри фрейма, что является потенциальной " +"[strong]дырой в безопасности[/strong] допуская возможность XFS (Cross Frame " +"Seripting)."
#: libraries/config/messages.inc.php:20 msgid "Allow third party framing" -msgstr "" +msgstr "Разрешить встраивание во фрейм"
#: libraries/config/messages.inc.php:21 msgid "Show "Drop database" link to normal users" @@ -2406,7 +2406,6 @@ msgid "Bzip2" msgstr "Bzip2"
#: libraries/config/messages.inc.php:30 -#, fuzzy #| msgid "" #| "Defines which type of editing controls should be used for CHAR and " #| "VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]" @@ -2421,10 +2420,9 @@ msgstr "" "использовать в полях перенос строки."
#: libraries/config/messages.inc.php:31 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" -msgstr "Поля редактирования CHAR" +msgstr "Редактирование полей типа CHAR"
#: libraries/config/messages.inc.php:32 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -2476,23 +2474,25 @@ msgstr "Подтверждать DROP запросы"
#: libraries/config/messages.inc.php:42 msgid "Debug SQL" -msgstr "" +msgstr "Отладка SQL"
#: libraries/config/messages.inc.php:43 -#, fuzzy #| msgid "Databases display options" msgid "Default display direction" -msgstr "Параметры отображения списка баз данных" +msgstr "Вид отображения по умолчанию"
#: libraries/config/messages.inc.php:44 msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]horizontal[/kbd], [kbd]vertical[/kbd] или [kbd]horizontalflipped[/kbd] " +"для определения горизонтального, вертикального или смешанного режима " +"отображения"
#: libraries/config/messages.inc.php:45 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "Вид отображения столбцов при их редакции/создании"
#: libraries/config/messages.inc.php:46 msgid "Tab that is displayed when entering a database" @@ -2519,10 +2519,9 @@ msgid "Default table tab" msgstr "Вкладка по умолчанию для таблицы"
#: libraries/config/messages.inc.php:52 -#, fuzzy #| msgid "Show binary contents as HEX" msgid "Show binary contents as HEX by default" -msgstr "Показывать бинарные данные в виде HEX значений" +msgstr "Показывать двоичные данные по умолчанию в шестнадцатеричном виде (HEX)"
#: libraries/config/messages.inc.php:53 libraries/display_tbl.lib.php:597 msgid "Show binary contents as HEX" @@ -2549,13 +2548,12 @@ msgstr "Выводить серверы списком"
#: libraries/config/messages.inc.php:58 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Редактировать SQL запросы во всплывающем окне"
#: libraries/config/messages.inc.php:59 -#, fuzzy #| msgid "Edit next row" msgid "Edit in window" -msgstr "Редактировать следующую строку" +msgstr "Редактировать в окне"
#: libraries/config/messages.inc.php:60 #, fuzzy
hooks/post-receive