The branch, master has been updated via 211299621773591d15ed16bfab93143aa24cab97 (commit) via 4d77222f973fca1c93ff074db558343a7eeafda1 (commit) via 3b54cd4018c23ac259a8122125bf79d6d2b9de2d (commit) via 6db45a52f5ebb582f201e8025621f75dbe67eb43 (commit) via 1e2ef68b24542566f0e6f4c4ab67e7815106f496 (commit) via 632db85e88bfa7bd794f5d7fb14723c884ae1752 (commit) via 26e66769470a0bf4dc5280a522896f44bef347b2 (commit) via 791aadcd661317aa3e7a5c3c1625680357cba928 (commit) from 5d05a5311233deb85c2b8e1fca2816c2c9fe1a03 (commit)
- Log ----------------------------------------------------------------- commit 211299621773591d15ed16bfab93143aa24cab97 Merge: 5d05a5311233deb85c2b8e1fca2816c2c9fe1a03 4d77222f973fca1c93ff074db558343a7eeafda1 Author: Michal Čihař mcihar@novell.com Date: Fri May 14 13:54:45 2010 +0200
Merge remote branch 'pootle/master'
Conflicts: po/ur.po
commit 4d77222f973fca1c93ff074db558343a7eeafda1 Author: monymirza monymirza@gmail.com Date: Fri May 14 12:35:57 2010 +0200
Translation update done using Pootle.
commit 3b54cd4018c23ac259a8122125bf79d6d2b9de2d Author: monymirza monymirza@gmail.com Date: Fri May 14 12:35:39 2010 +0200
Translation update done using Pootle.
commit 6db45a52f5ebb582f201e8025621f75dbe67eb43 Author: monymirza monymirza@gmail.com Date: Fri May 14 12:35:30 2010 +0200
Translation update done using Pootle.
commit 1e2ef68b24542566f0e6f4c4ab67e7815106f496 Author: monymirza monymirza@gmail.com Date: Fri May 14 12:34:31 2010 +0200
Translation update done using Pootle.
commit 632db85e88bfa7bd794f5d7fb14723c884ae1752 Author: monymirza monymirza@gmail.com Date: Fri May 14 12:34:15 2010 +0200
Translation update done using Pootle.
commit 26e66769470a0bf4dc5280a522896f44bef347b2 Author: monymirza monymirza@gmail.com Date: Fri May 14 12:34:01 2010 +0200
Translation update done using Pootle.
commit 791aadcd661317aa3e7a5c3c1625680357cba928 Author: monymirza monymirza@gmail.com Date: Fri May 14 12:33:40 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/ur.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/po/ur.po b/po/ur.po index 28c8cc8..68d7036 100644 --- a/po/ur.po +++ b/po/ur.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-14 07:48-0400\n" -"PO-Revision-Date: 2010-04-09 14:02+0200\n" -"Last-Translator: Michal michal@cihar.com\n" +"PO-Revision-Date: 2010-05-14 12:35+0200\n" +"Last-Translator: monymirza@gmail.com\n" "Language-Team: Urdu ur@li.org\n" +"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n"
@@ -21,14 +21,14 @@ msgstr "" #: libraries/display_tbl.lib.php:417 libraries/messages.inc.php:866 #: server_privileges.php:1475 msgid "Show all" -msgstr "" +msgstr "سبھی دکھاو"
#: browse_foreigners.php:82 db_operations.php:648 #: libraries/common.lib.php:2304 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 libraries/messages.inc.php:593 #: pdf_schema.php:283 pdf_schema.php:1123 pdf_schema.php:1139 msgid "Page number:" -msgstr "" +msgstr "صفحہ نمبر"
#: browse_foreigners.php:132 libraries/messages.inc.php:1238 msgid "" @@ -42,7 +42,7 @@ msgstr "" #: db_structure.php:106 libraries/db_links.inc.php:75 #: libraries/messages.inc.php:837 libraries/tbl_links.inc.php:63 msgid "Search" -msgstr "" +msgstr "تلاش"
#: browse_foreigners.php:153 db_operations.php:383 db_operations.php:425 #: db_operations.php:495 db_operations.php:603 db_operations.php:696 @@ -71,25 +71,25 @@ msgstr "" #: tbl_structure.php:598 tbl_tracking.php:395 tbl_tracking.php:512 #: view_create.php:182 view_operations.php:101 msgid "Go" -msgstr "" +msgstr "جائو"
#: browse_foreigners.php:168 browse_foreigners.php:172 #: libraries/Index.class.php:442 libraries/messages.inc.php:455 #: tbl_tracking.php:320 msgid "Keyname" -msgstr "" +msgstr "کی نیم"
#: browse_foreigners.php:169 browse_foreigners.php:171 #: libraries/messages.inc.php:248 server_collations.php:55 #: server_collations.php:67 server_engines.php:59 server_status.php:628 msgid "Description" -msgstr "" +msgstr "وضاحت"
#: browse_foreigners.php:247 browse_foreigners.php:256 #: browse_foreigners.php:268 browse_foreigners.php:276 #: libraries/messages.inc.php:1214 msgid "Use this value" -msgstr "" +msgstr "یہ ویلیو استعمال کریں"
#: db_create.php:46 libraries/messages.inc.php:211 #, php-format
hooks/post-receive