[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4094-gccfd008 - Git

17 Jun 2011

The branch, master has been updated
       via  ccfd008f52f18cb92279650ebd24c49a484d91d3 (commit)
       via  f55f399de659b4cdfef547274df023ec4274c910 (commit)
       via  e2ebf7f6678031e270dbc32ff13bd0275f4bbe2a (commit)
       via  75fe6d5c49e1764383497c504c401c7b74b41d2d (commit)
      from  0d61081c29293267a4dce932519c0a52b603f9a1 (commit)
- Log -----------------------------------------------------------------
commit ccfd008f52f18cb92279650ebd24c49a484d91d3
Merge: 0d61081c29293267a4dce932519c0a52b603f9a1 f55f399de659b4cdfef547274df023ec4274c910
Author: Michal Čihař mcihar@suse.cz
Date:   Fri Jun 17 11:54:11 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts:
    	po/uk.po
commit f55f399de659b4cdfef547274df023ec4274c910
Author: Michal Čihař michal@cihar.com
Date:   Fri Jun 17 10:55:43 2011 +0200
Translation update done using Pootle.
commit e2ebf7f6678031e270dbc32ff13bd0275f4bbe2a
Author: Michal Čihař michal@cihar.com
Date:   Fri Jun 17 10:55:38 2011 +0200
Translation update done using Pootle.
commit 75fe6d5c49e1764383497c504c401c7b74b41d2d
Author: Michal Čihař michal@cihar.com
Date:   Fri Jun 17 10:55:28 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/uk.po |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 0ba3efc..40a5f6e 100644
--- a/po/uk.po
+++ b/po/uk.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-06-17 10:58+0200\n"
-"PO-Revision-Date: 2010-12-28 22:26+0200\n"
-"Last-Translator: Olexiy Zagorskyi zalex_ua@i.ua\n"
+"PO-Revision-Date: 2011-06-17 10:55+0200\n"
+"Last-Translator: Michal Čihař michal@cihar.com\n"
 "Language-Team: ukrainian uk@li.org\n"
 "Language: uk\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.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53
@@ -113,6 +113,8 @@ msgid ""
 "The %s file is not available on this system, please visit www.phpmyadmin.net "
 "for more information."
 msgstr ""
+"файл %s недоступний на сервері, будь ласка завітайте на www.phpmyadmin.net "
+"за додатковою інформацією."
#: db_create.php:58
 #, php-format
@@ -416,7 +418,7 @@ msgstr "Переключитись на"
#: db_qbe.php:186
 msgid "visual builder"
-msgstr ""
+msgstr "Візуальний конструктор"
#: db_qbe.php:222 libraries/db_structure.lib.php:95
 #: libraries/display_tbl.lib.php:914
@@ -596,7 +598,7 @@ msgstr "Таблицю %s було очищено"
 #: db_structure.php:287 tbl_operations.php:705
 #, php-format
 msgid "View %s has been dropped"
-msgstr ""
+msgstr "Вигляд %s знищено"
#: db_structure.php:287 tbl_operations.php:705
 #, php-format
hooks/post-receive
-- 
phpMyAdmin


    