The branch, master has been updated via e52f78994d0bba1086b0c02606804474f569eda9 (commit) via 1243dfdcec43529c87c181ddfe25a0a95fb7c7f7 (commit) via f1b365403b39fca6e45febc8f932bc1ff3f4f4c0 (commit) via a8ca09dce5cd0c986421676e180f07f74d7429a7 (commit) via af6cb35cb4b9576c19e2e0f7a8a33778d517112f (commit) via 67556185afce2010f768444319657caa274eea22 (commit) via 67790547181c0379d6d9a6c44e71bd11228f888a (commit) via 15bca6e0d9a346336f97e8834f5898f69ed202df (commit) via c7f51215b888997025e6f7232a4c2cb197457bc8 (commit) via 1fc74ea2065834bcfd46f4a738a99875fe4d8758 (commit) via 05b6dde4579450bbc3ab7b592bba3a858d801622 (commit) via dd6a5b82168dd76ffd336420d8af45536f9f7e4b (commit) via af1dceb2eb4a401d94d429b7883d69f1b6ee143d (commit) from 31244e29d5105e6d632526fb356bcbbac1acb9dc (commit)

- Log ----------------------------------------------------------------- commit e52f78994d0bba1086b0c02606804474f569eda9 Merge: 31244e29d5105e6d632526fb356bcbbac1acb9dc 1243dfdcec43529c87c181ddfe25a0a95fb7c7f7 Author: Michal Čihař mcihar@novell.com Date: Wed Jul 21 08:54:05 2010 +0200

Merge remote branch 'pootle/master'

commit 1243dfdcec43529c87c181ddfe25a0a95fb7c7f7 Author: ablat7ihlim ablat7ihlim@yahoo.com.cn Date: Wed Jul 21 06:37:03 2010 +0200

Translation update done using Pootle.

commit f1b365403b39fca6e45febc8f932bc1ff3f4f4c0 Author: ablat7ihlim ablat7ihlim@yahoo.com.cn Date: Wed Jul 21 06:36:40 2010 +0200

Translation update done using Pootle.

commit a8ca09dce5cd0c986421676e180f07f74d7429a7 Author: ablat7ihlim ablat7ihlim@yahoo.com.cn Date: Wed Jul 21 06:36:14 2010 +0200

Translation update done using Pootle.

commit af6cb35cb4b9576c19e2e0f7a8a33778d517112f Author: ablat7ihlim ablat7ihlim@yahoo.com.cn Date: Wed Jul 21 06:32:00 2010 +0200

Translation update done using Pootle.

commit 67556185afce2010f768444319657caa274eea22 Author: ablat7ihlim ablat7ihlim@yahoo.com.cn Date: Wed Jul 21 06:31:41 2010 +0200

Translation update done using Pootle.

commit 67790547181c0379d6d9a6c44e71bd11228f888a Author: ablat7ihlim ablat7ihlim@yahoo.com.cn Date: Wed Jul 21 06:31:08 2010 +0200

Translation update done using Pootle.

commit 15bca6e0d9a346336f97e8834f5898f69ed202df Author: ablat7ihlim ablat7ihlim@yahoo.com.cn Date: Wed Jul 21 06:30:27 2010 +0200

Translation update done using Pootle.

commit c7f51215b888997025e6f7232a4c2cb197457bc8 Author: ablat7ihlim ablat7ihlim@yahoo.com.cn Date: Wed Jul 21 06:28:03 2010 +0200

Translation update done using Pootle.

commit 1fc74ea2065834bcfd46f4a738a99875fe4d8758 Author: ablat7ihlim ablat7ihlim@yahoo.com.cn Date: Wed Jul 21 06:27:33 2010 +0200

Translation update done using Pootle.

commit 05b6dde4579450bbc3ab7b592bba3a858d801622 Author: gheni gheni@yahoo.cn Date: Wed Jul 21 04:32:28 2010 +0200

Translation update done using Pootle.

commit dd6a5b82168dd76ffd336420d8af45536f9f7e4b Author: gheni gheni@yahoo.cn Date: Wed Jul 21 04:32:18 2010 +0200

Translation update done using Pootle.

commit af1dceb2eb4a401d94d429b7883d69f1b6ee143d Author: gheni gheni@yahoo.cn Date: Wed Jul 21 04:32:10 2010 +0200

Translation update done using Pootle.

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

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

diff --git a/po/ug.po b/po/ug.po index 665f10b..5442971 100644 --- a/po/ug.po +++ b/po/ug.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-07-20 15:10+0200\n" -"PO-Revision-Date: 2010-07-20 11:46+0200\n" -"Last-Translator: gheni@yahoo.cn\n" +"PO-Revision-Date: 2010-07-21 06:37+0200\n" +"Last-Translator: ablat7ihlim@yahoo.com.cn\n" "Language-Team: Uyghur ug@li.org\n" "Language: ug\n" "MIME-Version: 1.0\n" @@ -500,7 +500,7 @@ msgid "Search results for "<i>%s</i>" %s:" msgstr ""<i>%s</i>" نىڭ ئىزلەش نەتىجىسى %s:"

#: db_search.php:242 -#, fuzzy, php-format +#, php-format #| msgid "%s match(es) inside table <i>%s</i>" msgid "%s match inside table <i>%s</i>" msgid_plural "%s matches inside table <i>%s</i>" @@ -523,7 +523,7 @@ msgid "Delete" msgstr "ئۆچۈرۈش"

#: db_search.php:267 -#, fuzzy, php-format +#, php-format #| msgid "<b>Total:</b> <i>%s</i> match(es)" msgid "<b>Total:</b> <i>%s</i> match" msgid_plural "<b>Total:</b> <i>%s</i> matches" @@ -804,7 +804,7 @@ msgid "Dump has been saved to file %s." msgstr "%s ھۆججىتىدە ساقلاندى."

#: import.php:59 -#, fuzzy, php-format +#, php-format msgid "" "You probably tried to upload too large file. Please refer to %sdocumentation" "%s for ways to workaround this limit." @@ -1471,14 +1471,14 @@ msgstr ""

#: libraries/auth/cookie.auth.lib.php:230 msgid "Log in" -msgstr "" +msgstr "كىرىش"

#: libraries/auth/cookie.auth.lib.php:232 #: libraries/auth/cookie.auth.lib.php:234 #: libraries/navigation_header.inc.php:92 #: libraries/navigation_header.inc.php:94 msgid "phpMyAdmin documentation" -msgstr "" +msgstr "phpMyAdmin ھۆججىتى"

#: libraries/auth/cookie.auth.lib.php:244 #: libraries/auth/cookie.auth.lib.php:245 @@ -1487,19 +1487,19 @@ msgstr ""

#: libraries/auth/cookie.auth.lib.php:244 msgid "Server:" -msgstr "" +msgstr "مۇلازىمىتېر:"

#: libraries/auth/cookie.auth.lib.php:249 msgid "Username:" -msgstr "" +msgstr "ئابۇنىت ئىسمى:"

#: libraries/auth/cookie.auth.lib.php:253 msgid "Password:" -msgstr "" +msgstr "شىفىر"

#: libraries/auth/cookie.auth.lib.php:260 msgid "Server Choice" -msgstr "" +msgstr "مۇلازىمىتېر تاللاش"

#: libraries/auth/cookie.auth.lib.php:306 libraries/header.inc.php:58 msgid "Cookies must be enabled past this point." @@ -1551,15 +1551,15 @@ msgstr ""

#: libraries/blobstreaming.lib.php:693 msgid "Play audio" -msgstr "" +msgstr "ئاۋاز قۇيۇش"

#: libraries/blobstreaming.lib.php:698 msgid "View video" -msgstr "" +msgstr "سىن قۇيۇش"

#: libraries/blobstreaming.lib.php:702 msgid "Download file" -msgstr "" +msgstr "ھۆججەت چۈشۈرۈش"

#: libraries/common.inc.php:567 msgid ""

hooks/post-receive