[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5770-g9076639

[Michal Čihař]

The branch, master has been updated
       via  907663959b30a7f269d722201599db6ed7b31347 (commit)
       via  2288d4bf2e8bc30f9b7ff8e28911f046a1b0cfb2 (commit)
       via  dc873dd68a6f80edf443c76f91e7c041bb583169 (commit)
       via  9b2a7e30e318cb4f7cc9076fc67b67695e3dd077 (commit)
       via  be361aa8570e6b103c90c959ef31a0fed2d1441d (commit)
      from  0f090b8d7a7446b9d8621329e63470ee5bfda227 (commit)


- Log -----------------------------------------------------------------
commit 907663959b30a7f269d722201599db6ed7b31347
Merge: 0f090b8d7a7446b9d8621329e63470ee5bfda227 2288d4bf2e8bc30f9b7ff8e28911f046a1b0cfb2
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Jul 20 14:46:46 2010 +0200

    Merge remote branch 'pootle/master'
    
    Conflicts:
    	po/ug.po

commit 2288d4bf2e8bc30f9b7ff8e28911f046a1b0cfb2
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 20 11:46:35 2010 +0200

    Translation update done using Pootle.

commit dc873dd68a6f80edf443c76f91e7c041bb583169
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 20 11:28:53 2010 +0200

    Translation update done using Pootle.

commit 9b2a7e30e318cb4f7cc9076fc67b67695e3dd077
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 20 11:28:24 2010 +0200

    Translation update done using Pootle.

commit be361aa8570e6b103c90c959ef31a0fed2d1441d
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 20 11:27:23 2010 +0200

    Translation update done using Pootle.

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

Summary of changes:
 po/ug.po |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/ug.po b/po/ug.po
index 3bfcad1..47c4295 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-07-20 12:14+0200\n"
-"PO-Revision-Date: 2010-07-20 11:03+0200\n"
+"PO-Revision-Date: 2010-07-20 11:46+0200\n"
 "Last-Translator:  <gheni at yahoo.cn>\n"
 "Language-Team: Uyghur <ug at li.org>\n"
 "Language: ug\n"
@@ -984,7 +984,7 @@ msgstr "تاشقى ئاچقۇق قىممىتى"
 
 #: js/messages.php:62
 msgid "Please select the primary key or a unique key"
-msgstr ""
+msgstr "ئاساسىي قىممەت ياكى بىردىنبىر قىمەتنى تاللاڭ"
 
 # column نى سۆزلەم دەپ ئالساق مۇۋاپىق بولغىدەك
 #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548
@@ -993,11 +993,11 @@ msgstr "سۆزلەمنى كۆرسەتمەسلىك"
 
 #: js/messages.php:66
 msgid "Generate password"
-msgstr ""
+msgstr "پارول ھاسىللاش"
 
 #: js/messages.php:67 libraries/replication_gui.lib.php:366
 msgid "Generate"
-msgstr ""
+msgstr "ھاسىللاش"
 
 #. l10n: Display text for calendar close link
 #: js/messages.php:77
@@ -1324,7 +1324,7 @@ msgstr "تەھىرلەش"
 
 #: libraries/Index.class.php:472
 msgid "The primary key has been dropped"
-msgstr ""
+msgstr "ئاساسىي قىممەت ئۆچۈرۈلدى"
 
 #: libraries/Index.class.php:476
 #, php-format


hooks/post-receive
-- 
phpMyAdmin