[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-5971-g406f7e8

[Michal Čihař]

The branch, master has been updated
       via  406f7e865398a698a6034271455984f80b4e7a24 (commit)
       via  21649938d535bf999680df8c2073d798c9e3e15e (commit)
       via  30cc3866e6ad69acd0c5aa8e42d44af218f78b90 (commit)
       via  f6bba92e3e3a73cf21eb4391f40821f4ce30c44c (commit)
       via  187474b82901ee240eb4a9fe39226d2fe622efaa (commit)
       via  9b5c5dc321bf71eb78ef7b1538fe7ffa86f246db (commit)
       via  7033ecd338d90721951addfd1b1de616b90dd09c (commit)
       via  ca9d6ad1fc108d715891f910881d03cf0a749ed9 (commit)
       via  f9c6df0685c3c2cb70cce0d5ca396f3071edbfc8 (commit)
       via  bc4dbbd8c258d7003ce361655e83c82e51216359 (commit)
       via  4317af25ef788f0aae1a498e1ce8b9d708f347ac (commit)
       via  f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit)
      from  41bc587ed4494d21e7b69647a1235d2ca405c8ea (commit)


- Log -----------------------------------------------------------------
commit 406f7e865398a698a6034271455984f80b4e7a24
Merge: 21649938d535bf999680df8c2073d798c9e3e15e 30cc3866e6ad69acd0c5aa8e42d44af218f78b90
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Jul 27 09:04:47 2010 +0200

    Merge remote branch 'pootle/master'

commit 21649938d535bf999680df8c2073d798c9e3e15e
Merge: bc4dbbd8c258d7003ce361655e83c82e51216359 41bc587ed4494d21e7b69647a1235d2ca405c8ea
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Jul 27 09:04:15 2010 +0200

    Merge remote branch 'origin/master'

commit 30cc3866e6ad69acd0c5aa8e42d44af218f78b90
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 27 04:51:52 2010 +0200

    Translation update done using Pootle.

commit f6bba92e3e3a73cf21eb4391f40821f4ce30c44c
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 27 04:49:28 2010 +0200

    Translation update done using Pootle.

commit 187474b82901ee240eb4a9fe39226d2fe622efaa
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 27 04:48:48 2010 +0200

    Translation update done using Pootle.

commit 9b5c5dc321bf71eb78ef7b1538fe7ffa86f246db
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 27 04:34:10 2010 +0200

    Translation update done using Pootle.

commit 7033ecd338d90721951addfd1b1de616b90dd09c
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 27 04:31:39 2010 +0200

    Translation update done using Pootle.

commit ca9d6ad1fc108d715891f910881d03cf0a749ed9
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 27 04:31:27 2010 +0200

    Translation update done using Pootle.

commit f9c6df0685c3c2cb70cce0d5ca396f3071edbfc8
Author: gheni <gheni at yahoo.cn>
Date:   Tue Jul 27 04:30:41 2010 +0200

    Translation update done using Pootle.

commit bc4dbbd8c258d7003ce361655e83c82e51216359
Merge: 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 4317af25ef788f0aae1a498e1ce8b9d708f347ac
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon Jul 26 18:29:49 2010 +0200

    Merge branch 'QA_3_3'

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

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

diff --git a/po/ug.po b/po/ug.po
index 1f876d8..8595cec 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-26 17:18+0200\n"
-"PO-Revision-Date: 2010-07-26 05:01+0200\n"
+"PO-Revision-Date: 2010-07-27 04:51+0200\n"
 "Last-Translator:  <gheni at yahoo.cn>\n"
 "Language-Team: Uyghur <ug at li.org>\n"
 "Language: ug\n"
@@ -93,7 +93,7 @@ msgstr "مۇشۇ قىممەتنى ئىشلىتىش"
 
 #: bs_disp_as_mime_type.php:29 bs_play_media.php:35
 msgid "No blob streaming server configured!"
-msgstr ""
+msgstr "No blob streaming server configured!"
 
 #: bs_disp_as_mime_type.php:35
 #, fuzzy
@@ -103,7 +103,7 @@ msgstr "ھۆججەتنى دېسكىغا يىزىشتا خاتالىق كۆرۈل
 
 #: bs_disp_as_mime_type.php:41
 msgid "Failed to open remote URL"
-msgstr ""
+msgstr "URL نى ئېچىش مەغلۇب بولدى."
 
 #: db_create.php:44
 #, php-format
@@ -308,8 +308,8 @@ msgid ""
 "The phpMyAdmin configuration storage has been deactivated. To find out why "
 "click %shere%s."
 msgstr ""
-"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن "
-"%sبۇ يەرنى كۆرۈڭ%s."
+"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن %"
+"sبۇ يەرنى كۆرۈڭ%s."
 
 #: db_operations.php:497
 msgid "Edit PDF Pages"
@@ -1510,23 +1510,23 @@ msgstr "Cookies نى قوزغاتقاندىن كېيىن ئاندىن كېرىڭ
 #: libraries/auth/signon.auth.lib.php:180
 msgid ""
 "Login without a password is forbidden by configuration (see AllowNoPassword)"
-msgstr ""
+msgstr "پارولسىز كىرىش چەكلەنگەن (پارولسىز كىرىش ئىقازىتىنى كۆرۈڭ)"
 
 #: libraries/auth/cookie.auth.lib.php:642
 #: libraries/auth/signon.auth.lib.php:184
 #, php-format
 msgid "No activity within %s seconds; please log in again"
-msgstr ""
+msgstr "No activity within %s seconds; please log in again"
 
 #: libraries/auth/cookie.auth.lib.php:652
 #: libraries/auth/cookie.auth.lib.php:654
 #: libraries/auth/signon.auth.lib.php:190
 msgid "Cannot log in to the MySQL server"
-msgstr ""
+msgstr "MySQL مۇلازىمىتېرىغا ئۇلىنالمىدى."
 
 #: libraries/auth/http.auth.lib.php:69
 msgid "Wrong username/password. Access denied."
-msgstr ""
+msgstr "كىرگۈزگەن ئىسلەتكۈچى ئىسمى\\پارول خاتا، زايارەت رەت قىلىندى."
 
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #, php-format


hooks/post-receive
-- 
phpMyAdmin