[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23858-gd76f188 - Git

2 Dec 2011

The branch, master has been updated
       via  d76f1884aa642e1a6a4076f6cbd9f9eb656311b0 (commit)
       via  b35747d4e572e489878a0dbfed7ff7b71ac4f192 (commit)
       via  2c79eae32337576cb981f42f9df99a18bb6026e0 (commit)
       via  0c6dbd444884a7671175335321c26c5e8c8dff98 (commit)
       via  d02486105317fe974ed3ea44777a7860f7eeb2ec (commit)
       via  df48915b6b766561e164c54ae12ac56adff375f1 (commit)
       via  47539250dd22c203c81c1cdee0bbcb44d336e37f (commit)
       via  cca103b3982c8a37db953d11db4236be06572b74 (commit)
      from  9f04e8f7bbc98ea5eb7e2df7beae66e93f2437dc (commit)
- Log -----------------------------------------------------------------
commit d76f1884aa642e1a6a4076f6cbd9f9eb656311b0
Merge: b35747d 9f04e8f
Author: Pootle server pootle@cihar.com
Date:   Fri Dec 2 06:40:12 2011 +0100
Merge remote-tracking branch 'origin/master'
commit b35747d4e572e489878a0dbfed7ff7b71ac4f192
Merge: 2c79eae d39a230
Author: Pootle server pootle@cihar.com
Date:   Fri Dec 2 02:40:22 2011 +0100
Merge remote-tracking branch 'origin/master'
commit 2c79eae32337576cb981f42f9df99a18bb6026e0
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Thu Dec 1 22:16:26 2011 +0200
Translation update done using Pootle.
commit 0c6dbd444884a7671175335321c26c5e8c8dff98
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Thu Dec 1 22:15:13 2011 +0200
Translation update done using Pootle.
commit d02486105317fe974ed3ea44777a7860f7eeb2ec
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Thu Dec 1 22:15:02 2011 +0200
Translation update done using Pootle.
commit df48915b6b766561e164c54ae12ac56adff375f1
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Thu Dec 1 22:14:20 2011 +0200
Translation update done using Pootle.
commit 47539250dd22c203c81c1cdee0bbcb44d336e37f
Author: ProUser stefan@inkopsforum.se
Date:   Thu Dec 1 20:00:25 2011 +0200
Translation update done using Pootle.
commit cca103b3982c8a37db953d11db4236be06572b74
Author: ProUser stefan@inkopsforum.se
Date:   Thu Dec 1 19:58:50 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/ru.po |   19 ++++++++++---------
 po/sv.po |    7 ++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 846b6aa..f9bf865 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,15 +4,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-12-01 15:49+0100\n"
-"PO-Revision-Date: 2011-11-22 21:16+0200\n"
+"PO-Revision-Date: 2011-12-01 22:15+0200\n"
 "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n"
 "Language-Team: russian ru@li.org\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.1.6\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:329
@@ -4711,12 +4711,13 @@ msgid ""
 "Limits number of table preferences which are stored in database, the oldest "
 "records are automatically removed"
 msgstr ""
+"Ограничивает количество хранимых в базе данных свойств таблицы, устаревшие "
+"автоматически удаляются"
#: libraries/config/messages.inc.php:403
-#, fuzzy
 #| msgid "Maximum number of tables displayed in table list"
 msgid "Maximal number of table preferences to store"
-msgstr "Максимальное количество таблиц отображаемых в списке"
+msgstr "Максимальное количество хранимых свойств таблицы"
#: libraries/config/messages.inc.php:404
 msgid "Try to connect without password"
@@ -9671,9 +9672,8 @@ msgid "Refresh rate: "
 msgstr "Частота обновления:"
#: server_status.php:830 server_variables.php:115
-#, fuzzy
 msgid "Filters"
-msgstr "Фильтр"
+msgstr "Фильтры"
#: server_status.php:832 server_variables.php:117
 msgid "Containing the word:"
@@ -12809,14 +12809,15 @@ msgid "Percentage of used open files limit"
 msgstr "Процентное соотношение использованного ограничения открытых файлов"
#: po/advisory_rules.php:186
-#, fuzzy
 #| msgid ""
 #| "The number of open files is approaching the max number of open files.  "
 #| "You may get a \"Too many open files\" error."
 msgid ""
 "The number of open files is approaching the max number of open files.  You "
 "may get a "Too many open files" error."
-msgstr "Количество открытых файлов приближается к максимальному."
+msgstr ""
+"Количество открытых файлов приближается к максимальному. Возможно появление "
+"ошибки "Слишком много открытых файлов"."
#: po/advisory_rules.php:187 po/advisory_rules.php:192
 msgid ""
diff --git a/po/sv.po b/po/sv.po
index ff1e204..43ac7dd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-12-01 15:49+0100\n"
-"PO-Revision-Date: 2011-11-24 01:21+0200\n"
+"PO-Revision-Date: 2011-12-01 19:58+0200\n"
 "Last-Translator: ProUser stefan@inkopsforum.se\n"
 "Language-Team: swedish sv@li.org\n"
 "Language: sv\n"
@@ -4669,12 +4669,13 @@ msgid ""
 "Limits number of table preferences which are stored in database, the oldest "
 "records are automatically removed"
 msgstr ""
+"Begränsar antalet tabell preferenser som lagras i databasen, de äldsta "
+"posterna tas bort automatiskt"
#: libraries/config/messages.inc.php:403
-#, fuzzy
 #| msgid "Maximum number of tables displayed in table list"
 msgid "Maximal number of table preferences to store"
-msgstr "Maximalt antal tabeller som visas i tabellista"
+msgstr "Maximalt antal tabell inställningar att spara"
#: libraries/config/messages.inc.php:404
 msgid "Try to connect without password"
hooks/post-receive
-- 
phpMyAdmin


    