[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1772-g7d5efb5

Michal Čihař nijel at users.sourceforge.net
Thu Mar 3 07:14:09 CET 2011


The branch, master has been updated
       via  7d5efb58dc67ddd1b654bb2431c82d9562e321bd (commit)
       via  85ca9c02c30ef87f4df2cfdd9a1fc44adb34225f (commit)
       via  9d8e6aa9b5095858a97a2b506d90909e2ef2bfba (commit)
       via  7e9244e4fb5a2743a14fe3016a25187683daa067 (commit)
       via  a9ef43eebaaed59143689344f8460dbf6b846090 (commit)
       via  5f7c9c6615e4d4084f86a26a59c4b1b2e6e223d7 (commit)
       via  a0c6de2f8a38ca46a9d9db18ec79d088ddeafba0 (commit)
       via  53a110d3456137fe26d4bf9e3d0a29907be83954 (commit)
       via  4053691d399335df54719f24fed0296b4df515f2 (commit)
       via  ea7c3e0f66f2de27fbb6b688724056c5b452f09f (commit)
      from  f07a0842f0016c4bd1596423346d38f462590b6b (commit)


- Log -----------------------------------------------------------------
commit 7d5efb58dc67ddd1b654bb2431c82d9562e321bd
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Mar 3 07:13:49 2011 +0100

    Escape html

commit 85ca9c02c30ef87f4df2cfdd9a1fc44adb34225f
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Mar 3 07:12:17 2011 +0100

    Fix translated string

commit 9d8e6aa9b5095858a97a2b506d90909e2ef2bfba
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date:   Wed Mar 2 22:32:00 2011 +0200

    Translation update done using Pootle.

commit 7e9244e4fb5a2743a14fe3016a25187683daa067
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date:   Wed Mar 2 22:31:49 2011 +0200

    Translation update done using Pootle.

commit a9ef43eebaaed59143689344f8460dbf6b846090
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date:   Wed Mar 2 22:30:42 2011 +0200

    Translation update done using Pootle.

commit 5f7c9c6615e4d4084f86a26a59c4b1b2e6e223d7
Merge: a0c6de2f8a38ca46a9d9db18ec79d088ddeafba0 f07a0842f0016c4bd1596423346d38f462590b6b
Author: Pootle server <pootle at cihar.com>
Date:   Wed Mar 2 20:40:04 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit a0c6de2f8a38ca46a9d9db18ec79d088ddeafba0
Author: zippoxer <zippoxer at gmail.com>
Date:   Wed Mar 2 20:17:48 2011 +0200

    Translation update done using Pootle.

commit 53a110d3456137fe26d4bf9e3d0a29907be83954
Author: zippoxer <zippoxer at gmail.com>
Date:   Wed Mar 2 20:16:47 2011 +0200

    Translation update done using Pootle.

commit 4053691d399335df54719f24fed0296b4df515f2
Author: zippoxer <zippoxer at gmail.com>
Date:   Wed Mar 2 20:13:01 2011 +0200

    Translation update done using Pootle.

commit ea7c3e0f66f2de27fbb6b688724056c5b452f09f
Author: zippoxer <zippoxer at gmail.com>
Date:   Wed Mar 2 20:09:32 2011 +0200

    Translation update done using Pootle.

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

Summary of changes:
 db_search.php |    2 +-
 po/he.po      |   17 +++++++++--------
 po/tr.po      |    9 ++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/db_search.php b/db_search.php
index 8362fc7..c401a4f 100644
--- a/db_search.php
+++ b/db_search.php
@@ -256,7 +256,7 @@ if (isset($_REQUEST['submit_search'])) {
             $this_url_params['sql_query'] = $newsearchsqls['delete'];
             $delete_result_path = 'sql.php' . PMA_generate_common_url($this_url_params);
             ?>
-            <td> <a name="delete_search" href="<?php echo $delete_result_path; ?>" onclick="deleteResult('<?php echo $delete_result_path ?>' , ' <?php echo __('Delete the matches for the '. $each_table . ' table?') ?>','<?php echo ($GLOBALS['cfg']['AjaxEnable']); ?>');return false;" ><?php echo __('Delete') ?></a>   </td>
+            <td> <a name="delete_search" href="<?php echo $delete_result_path; ?>" onclick="deleteResult('<?php echo $delete_result_path ?>' , ' <?php printf(__('Delete the matches for the %s table?'), htmlspecialchars($each_table)); ?>','<?php echo ($GLOBALS['cfg']['AjaxEnable']); ?>');return false;" ><?php echo __('Delete') ?></a>   </td>
             <?php
          } else {
             echo '<td> </td>' . "\n"
diff --git a/po/he.po b/po/he.po
index 2bcd0dd..8a062b2 100644
--- a/po/he.po
+++ b/po/he.po
@@ -4,19 +4,20 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-03-02 15:32+0100\n"
-"PO-Revision-Date: 2010-03-12 09:15+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-03-02 20:17+0200\n"
+"Last-Translator:  <zippoxer at gmail.com>\n"
 "Language-Team: hebrew <he at li.org>\n"
-"Language: \n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: browse_foreigners.php:35 browse_foreigners.php:53
 #: libraries/display_tbl.lib.php:415 server_privileges.php:1600
 msgid "Show all"
-msgstr "ראיית הכל"
+msgstr "הצג הכל"
 
 #: browse_foreigners.php:70 libraries/common.lib.php:2326
 #: libraries/display_tbl.lib.php:392 libraries/export/pdf.php:133
@@ -32,7 +33,7 @@ msgid ""
 "The target browser window could not be updated. Maybe you have closed the "
 "parent window, or your browser's security settings are configured to block "
 "cross-window updates."
-msgstr ""
+msgstr "עדכון חלון הדפדפן הנבחר נכשל."
 
 #: browse_foreigners.php:151 libraries/common.lib.php:2822
 #: libraries/common.lib.php:2829 libraries/common.lib.php:3008
@@ -425,7 +426,7 @@ msgstr "עליך לבחור לפחות עמודה אחת לתצוגה"
 
 #: db_qbe.php:183
 msgid "Switch to"
-msgstr ""
+msgstr "החלף ל"
 
 #: db_qbe.php:187
 msgid "visual builder"
@@ -9815,7 +9816,7 @@ msgstr ""
 
 #: themes.php:41
 msgid "Get more themes!"
-msgstr ""
+msgstr "השג סגנונות נוספים."
 
 #: transformation_overview.php:24
 msgid "Available MIME types"
diff --git a/po/tr.po b/po/tr.po
index 117bf6b..2674551 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-03-02 15:32+0100\n"
-"PO-Revision-Date: 2011-02-22 21:49+0200\n"
+"PO-Revision-Date: 2011-03-02 22:32+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit at hotmail.com>\n"
 "Language-Team: turkish <tr at li.org>\n"
 "Language: tr\n"
@@ -533,7 +533,7 @@ msgstr "\"<i>%s</i>\" %s için arama sonuçları:"
 #, php-format
 msgid "%s match inside table <i>%s</i>"
 msgid_plural "%s matches inside table <i>%s</i>"
-msgstr[0] "%s eşleşme, <i>%s</i> tablosu içinde"
+msgstr[0] "%s benzeşme, <i>%s</i> tablosu içinde"
 
 #: db_search.php:254 libraries/common.lib.php:2824
 #: libraries/common.lib.php:3006 libraries/common.lib.php:3007
@@ -543,10 +543,9 @@ msgid "Browse"
 msgstr "Gözat"
 
 #: db_search.php:259
-#, fuzzy
 #| msgid "Delete the matches for the %s table?"
 msgid "Delete the matches for the "
-msgstr "%s tablosu için benzeşenler silinsin mi?"
+msgstr "Şunun için benzeşenleri sil: "
 
 #: db_search.php:259 libraries/display_tbl.lib.php:1201
 #: libraries/display_tbl.lib.php:2132
@@ -564,7 +563,7 @@ msgstr "Sil"
 #, php-format
 msgid "<b>Total:</b> <i>%s</i> match"
 msgid_plural "<b>Total:</b> <i>%s</i> matches"
-msgstr[0] "<b>Toplam:</b> <i>%s</i> eşleşme"
+msgstr[0] "<b>Toplam:</b> <i>%s</i> benzeşme"
 
 #: db_search.php:295
 msgid "Search in database"


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list