[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4090-g0d61081

[Michal Čihař]

The branch, master has been updated
       via  0d61081c29293267a4dce932519c0a52b603f9a1 (commit)
       via  0f271fcebd6576c80346b66beb2e85bf31c65521 (commit)
       via  b45de543c00b4eb39d9f67cb6d1c93f73f444863 (commit)
      from  0ef31125b4aafee74fa8eb9af761b6e0f89c9e5c (commit)


- Log -----------------------------------------------------------------
commit 0d61081c29293267a4dce932519c0a52b603f9a1
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Jun 17 11:52:54 2011 +0200

    Fix format strings

commit 0f271fcebd6576c80346b66beb2e85bf31c65521
Merge: 0ef31125b4aafee74fa8eb9af761b6e0f89c9e5c b45de543c00b4eb39d9f67cb6d1c93f73f444863
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Jun 17 11:50:43 2011 +0200

    Merge remote-tracking branch 'origin/QA_3_4'

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

Summary of changes:
 po/da.po |    2 +-
 po/fa.po |    4 ++--
 po/id.po |   12 ++++--------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/po/da.po b/po/da.po
index 5194819..9652f7d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1678,7 +1678,7 @@ msgid ""
 "The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
 "removed."
 msgstr ""
-"Indeks %1$ ser ud til at være identisk med indeks %2$, så et af dem kan "
+"Indeks %1$s ser ud til at være identisk med indeks %2$s, så et af dem kan "
 "sikkert fjernes"
 
 #: libraries/List_Database.class.php:430 libraries/config/messages.inc.php:177
diff --git a/po/fa.po b/po/fa.po
index ca6c3cf..dd5d4fd 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -403,7 +403,7 @@ msgstr ""
 #, php-format
 msgid "%s table"
 msgid_plural "%s tables"
-msgstr[0] "s% جدولs% جداول"
+msgstr[0] "%s جدول"
 
 #: db_qbe.php:41
 msgid "You have to choose at least one column to display"
@@ -526,7 +526,7 @@ msgstr "نتيجه جستجوي \"<i>%s</i>\" %s:"
 #, php-format
 msgid "%s match inside table <i>%s</i>"
 msgid_plural "%s matches inside table <i>%s</i>"
-msgstr[0] "s% عبارت همتا در جدول <i>%s</i>s% عبارت همتا در جدول <i>%s</i>"
+msgstr[0] "%s عبارت همتا در جدول <i>%s</i>"
 
 #: db_search.php:256 libraries/common.lib.php:2765
 #: libraries/common.lib.php:2950 libraries/common.lib.php:2951
diff --git a/po/id.po b/po/id.po
index 49b4402..80eb9af 100644
--- a/po/id.po
+++ b/po/id.po
@@ -403,7 +403,7 @@ msgstr "Pemeriksaan terakhir"
 #, php-format
 msgid "%s table"
 msgid_plural "%s tables"
-msgstr[0] "Tunggal% s tabelJamak% s tabel"
+msgstr[0] "%s tabel"
 
 #: db_qbe.php:41
 msgid "You have to choose at least one column to display"
@@ -524,9 +524,7 @@ msgstr "Hasil pencarian untuk \"<i>%s</i>\" %s:"
 #, php-format
 msgid "%s match inside table <i>%s</i>"
 msgid_plural "%s matches inside table <i>%s</i>"
-msgstr[0] ""
-"Tunggal% s cocok dalam tabel% <i> s </ i>Jamaks% cocok dalam tabel% <i> s </ "
-"i>"
+msgstr[0] "%s cocok dalam tabel <i>%s</i>"
 
 #: db_search.php:256 libraries/common.lib.php:2765
 #: libraries/common.lib.php:2950 libraries/common.lib.php:2951
@@ -537,7 +535,7 @@ msgstr "Browse"
 #: db_search.php:261
 #, php-format
 msgid "Delete the matches for the %s table?"
-msgstr "Hapus yang cocok untuk% s tabel?"
+msgstr "Hapus yang cocok untuk %s tabel?"
 
 #: db_search.php:261 libraries/display_tbl.lib.php:1302
 #: libraries/display_tbl.lib.php:2272
@@ -555,9 +553,7 @@ msgstr "Hapus"
 #, php-format
 msgid "<b>Total:</b> <i>%s</i> match"
 msgid_plural "<b>Total:</b> <i>%s</i> matches"
-msgstr[0] ""
-"Tunggal<b> Total: </ b>% <i> s </ i> cocokJamak<b> Total: </ b>% <i> s </ i> "
-"cocok"
+msgstr[0] "<b>Total:</b> <i>%s</i> cocok"
 
 #: db_search.php:297
 msgid "Search in database"


hooks/post-receive
-- 
phpMyAdmin