[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-214-g9946b82

Michal Čihař nijel at users.sourceforge.net
Thu Jan 13 13:20:10 CET 2011 

The branch, master has been updated
       via  9946b82a9edfbcb6c7fc6939528920b5d4ff81bc (commit)
       via  e5e05312dbe1b7ffebcdf850b88e2c56213060d1 (commit)
       via  e1b161be0f5b59050108daa7680bc72bca8236a7 (commit)
       via  ad37424f499dd9f35a995ee444c856775653dae5 (commit)
       via  8adf63259098c87b364326cd00a052928753762a (commit)
       via  9fdfcecc365003d2e8e758caca2346ef4da317af (commit)
       via  aec93e5e380bb69cf4b047e174f2480360b23088 (commit)
       via  5d05584e3843733ee164a14628e0442760c582c6 (commit)
       via  6c32ab65c977acfc362216e597492a6587b27d21 (commit)
       via  ee8c1d6ea31f8004fccdcb9b68e6d006dad19f23 (commit)
       via  1d966c7fa1f66a2bc01dd3a5ad843b0ff9a9fece (commit)
       via  210818c15a869c0a4928138bb1b11b56775dc120 (commit)
       via  36a6fb8bb258c8b62c15bc0257e63810d36f517b (commit)
      from  7ee006ff8b5dcb75d2f1b837e7a661de0e7aea14 (commit)


- Log -----------------------------------------------------------------
commit 9946b82a9edfbcb6c7fc6939528920b5d4ff81bc
Merge: 7ee006ff8b5dcb75d2f1b837e7a661de0e7aea14 e5e05312dbe1b7ffebcdf850b88e2c56213060d1
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Jan 13 13:19:40 2011 +0100

    Merge remote branch 'pootle/master'

commit e5e05312dbe1b7ffebcdf850b88e2c56213060d1
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:53:27 2011 +0200

    Translation update done using Pootle.

commit e1b161be0f5b59050108daa7680bc72bca8236a7
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:52:00 2011 +0200

    Translation update done using Pootle.

commit ad37424f499dd9f35a995ee444c856775653dae5
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:51:31 2011 +0200

    Translation update done using Pootle.

commit 8adf63259098c87b364326cd00a052928753762a
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:50:54 2011 +0200

    Translation update done using Pootle.

commit 9fdfcecc365003d2e8e758caca2346ef4da317af
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:49:46 2011 +0200

    Translation update done using Pootle.

commit aec93e5e380bb69cf4b047e174f2480360b23088
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:48:19 2011 +0200

    Translation update done using Pootle.

commit 5d05584e3843733ee164a14628e0442760c582c6
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:44:50 2011 +0200

    Translation update done using Pootle.

commit 6c32ab65c977acfc362216e597492a6587b27d21
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:42:51 2011 +0200

    Translation update done using Pootle.

commit ee8c1d6ea31f8004fccdcb9b68e6d006dad19f23
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:39:45 2011 +0200

    Translation update done using Pootle.

commit 1d966c7fa1f66a2bc01dd3a5ad843b0ff9a9fece
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:38:33 2011 +0200

    Translation update done using Pootle.

commit 210818c15a869c0a4928138bb1b11b56775dc120
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:31:22 2011 +0200

    Translation update done using Pootle.

commit 36a6fb8bb258c8b62c15bc0257e63810d36f517b
Author: Victor Volkov <hanut at php-myadmin.ru>
Date:   Thu Jan 13 13:26:56 2011 +0200

    Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes:
 po/ru.po |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 022ff6d..6b72dae 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 at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-01-07 07:51-0500\n"
-"PO-Revision-Date: 2011-01-13 01:04+0200\n"
+"PO-Revision-Date: 2011-01-13 13:53+0200\n"
 "Last-Translator: Victor Volkov <hanut at php-myadmin.ru>\n"
 "Language-Team: russian <ru at li.org>\n"
 "Language: ru\n"
@@ -2556,26 +2556,25 @@ msgid "Edit in window"
 msgstr "Редактировать в окне"
 
 #: libraries/config/messages.inc.php:60
-#, fuzzy
 #| msgid "Display Features"
 msgid "Display errors"
-msgstr "Показать возможности"
+msgstr "Выводить ошибки"
 
 #: libraries/config/messages.inc.php:61
-#, fuzzy
 #| msgid "Ignore errors"
 msgid "Gather errors"
-msgstr "Игнорировать ошибки"
+msgstr "Собирать ошибки"
 
 #: libraries/config/messages.inc.php:62
 msgid "Show icons for warning, error and information messages"
 msgstr ""
+"Отображать пиктограммы для сообщений об ошибках, а так же для "
+"предупреждающих и информационных сообщений"
 
 #: libraries/config/messages.inc.php:63
-#, fuzzy
 #| msgid "Ignore errors"
 msgid "Iconic errors"
-msgstr "Игнорировать ошибки"
+msgstr "Пиктограммы сообщений об ошибках"
 
 #: libraries/config/messages.inc.php:64
 msgid ""
@@ -2615,7 +2614,6 @@ msgstr "Упаковать"
 #: libraries/export/latex.php:71 libraries/export/ods.php:24
 #: libraries/export/odt.php:57 libraries/export/texytext.php:27
 #: libraries/export/xls.php:24 libraries/export/xlsx.php:24
-#, fuzzy
 #| msgid "Put fields names in the first row"
 msgid "Put columns names in the first row"
 msgstr "Поместить названия полей в первой строке"
@@ -2623,7 +2621,6 @@ msgstr "Поместить названия полей в первой стро
 #: libraries/config/messages.inc.php:71 libraries/config/messages.inc.php:236
 #: libraries/config/messages.inc.php:243 libraries/import/csv.php:73
 #: libraries/import/ldi.php:41
-#, fuzzy
 #| msgid "Fields enclosed by"
 msgid "Columns enclosed by"
 msgstr "Значения полей обрамлены"
@@ -2631,7 +2628,6 @@ msgstr "Значения полей обрамлены"
 #: libraries/config/messages.inc.php:72 libraries/config/messages.inc.php:237
 #: libraries/config/messages.inc.php:244 libraries/import/csv.php:77
 #: libraries/import/ldi.php:42
-#, fuzzy
 #| msgid "Fields escaped by"
 msgid "Columns escaped by"
 msgstr "Символ экранирования"
@@ -2645,18 +2641,16 @@ msgid "Replace NULL by"
 msgstr "Заменить NULL на"
 
 #: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:80
-#, fuzzy
 #| msgid "Remove CRLF characters within fields"
 msgid "Remove CRLF characters within columns"
-msgstr "Удалите из полей символы CRLF"
+msgstr "Удалить из полей символы перевода строки CRLF"
 
 #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:240
 #: libraries/config/messages.inc.php:248 libraries/import/csv.php:61
 #: libraries/import/ldi.php:40
-#, fuzzy
 #| msgid "Lines terminated by"
 msgid "Columns terminated by"
-msgstr "Разделитель строк"
+msgstr "Разделитель столбцов"
 
 #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:235
 #: libraries/import/csv.php:81 libraries/import/ldi.php:43
@@ -2664,10 +2658,9 @@ msgid "Lines terminated by"
 msgstr "Разделитель строк"
 
 #: libraries/config/messages.inc.php:78
-#, fuzzy
 #| msgid "Excel edition"
 msgid "Excel edition"
-msgstr "Excel-версия"
+msgstr "Версия Excel"
 
 #: libraries/config/messages.inc.php:81
 msgid "Database name template"


hooks/post-receive
-- 
phpMyAdmin

More information about the Git mailing list