[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14270-gb36f2e3

The branch, master has been updated via b36f2e3ca1f54c15d7b6b0236eb89cb3bbb8cdd2 (commit) via b0a8c5a20d70b271bfac3875fcc7ed5c6ac80f1f (commit) via d374feb9675ba835f0dce776872f3d4318b1acb8 (commit) from e4bb7fdcdd3a2f214c47444ef621c10403c16c72 (commit) - Log ----------------------------------------------------------------- commit b36f2e3ca1f54c15d7b6b0236eb89cb3bbb8cdd2 Merge: b0a8c5a e4bb7fd Author: Michal Čihař <mcihar@suse.cz> Date: Thu Aug 11 09:33:38 2011 +0200 Merge remote-tracking branch 'origin/master' commit b0a8c5a20d70b271bfac3875fcc7ed5c6ac80f1f Author: Michal Čihař <mcihar@suse.cz> Date: Thu Aug 11 09:33:05 2011 +0200 Use longer text for title commit d374feb9675ba835f0dce776872f3d4318b1acb8 Author: Michal Čihař <mcihar@suse.cz> Date: Thu Aug 11 09:32:42 2011 +0200 Add context to another potentionally unclear message ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 4 ++-- navigation.php | 2 +- po/af.po | 1 + po/ar.po | 1 + po/az.po | 1 + po/be.po | 1 + po/be@latin.po | 1 + po/bg.po | 1 + po/bn.po | 1 + po/br.po | 1 + po/bs.po | 1 + po/ca.po | 1 + po/cs.po | 1 + po/cy.po | 1 + po/da.po | 1 + po/de.po | 1 + po/el.po | 1 + po/en_GB.po | 1 + po/es.po | 1 + po/et.po | 1 + po/eu.po | 1 + po/fa.po | 1 + po/fi.po | 1 + po/fr.po | 1 + po/gl.po | 1 + po/he.po | 1 + po/hi.po | 1 + po/hr.po | 1 + po/hu.po | 1 + po/id.po | 1 + po/it.po | 1 + po/ja.po | 1 + po/ka.po | 1 + po/ko.po | 1 + po/lt.po | 1 + po/lv.po | 1 + po/mk.po | 1 + po/ml.po | 1 + po/mn.po | 1 + po/ms.po | 1 + po/nb.po | 1 + po/nl.po | 1 + po/pl.po | 1 + po/pt.po | 1 + po/pt_BR.po | 1 + po/ro.po | 1 + po/ru.po | 1 + po/si.po | 1 + po/sk.po | 1 + po/sl.po | 1 + po/sq.po | 1 + po/sr.po | 1 + po/sr@latin.po | 1 + po/sv.po | 1 + po/ta.po | 1 + po/te.po | 1 + po/th.po | 1 + po/tr.po | 1 + po/tt.po | 1 + po/ug.po | 1 + po/uk.po | 1 + po/ur.po | 1 + po/uz.po | 1 + po/uz@latin.po | 1 + po/zh_CN.po | 1 + po/zh_TW.po | 1 + 66 files changed, 67 insertions(+), 3 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index e5c90de..4850e41 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1213,7 +1213,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view "$('.tools form').last().after('[<a href=\"#\" title=\"" . PMA_escapeJsString(__('Inline edit of this query')) . "\" class=\"inline_edit_sql\">" . - PMA_escapeJsString(__('Inline')) . + PMA_escapeJsString(_pgettext('Inline edit query', 'Inline')) . "</a>]');\n" . "//]]>\n" . "</script>"; @@ -1811,7 +1811,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), /** - * Splits a URL string by parameter + * Splits a URL string by parameter * * @param string $url the URL * @return array the parameter/value pairs, for example [0] db=sakila diff --git a/navigation.php b/navigation.php index 22e4cda..dc60e22 100644 --- a/navigation.php +++ b/navigation.php @@ -267,7 +267,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { ?> <span id="NavFilter"> <span id="clear_fast_filter" title="<?php echo __('Clear'); ?>">X</span> - <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="<?php echo __('filter tables by name'); ?>" /> + <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter tables by name'); ?>" value="<?php echo __('Filter tables by name'); ?>" /> </span> <?php } diff --git a/po/af.po b/po/af.po index 400faca..d724d91 100644 --- a/po/af.po +++ b/po/af.po @@ -2619,6 +2619,7 @@ msgid "Inline edit of this query" msgstr "" #: libraries/common.lib.php:1216 +msgctxt "Inline edit query" msgid "Inline" msgstr "" diff --git a/po/ar.po b/po/ar.po index a2eb6ae..edb84bf 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2538,6 +2538,7 @@ msgid "Inline edit of this query" msgstr "تعديل سريع لهذا الإستعلام" #: libraries/common.lib.php:1216 +msgctxt "Inline edit query" msgid "Inline" msgstr "مضمن" diff --git a/po/az.po b/po/az.po index 1466586..baebba6 100644 --- a/po/az.po +++ b/po/az.po @@ -2650,6 +2650,7 @@ msgstr "" #: libraries/common.lib.php:1216 #, fuzzy #| msgid "Engines" +msgctxt "Inline edit query" msgid "Inline" msgstr "Motorlar" diff --git a/po/be.po b/po/be.po index 37b2159..c697e7e 100644 --- a/po/be.po +++ b/po/be.po @@ -2716,6 +2716,7 @@ msgstr "" #: libraries/common.lib.php:1216 #, fuzzy #| msgid "Engines" +msgctxt "Inline edit query" msgid "Inline" msgstr "Машыны" diff --git a/po/be@latin.po b/po/be@latin.po index 286e26b..6fcc4eb 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -2727,6 +2727,7 @@ msgstr "" #: libraries/common.lib.php:1216 #, fuzzy #| msgid "Engines" +msgctxt "Inline edit query" msgid "Inline" msgstr "Mašyny" diff --git a/po/bg.po b/po/bg.po index 4767fe7..91e54b8 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2550,6 +2550,7 @@ msgid "Inline edit of this query" msgstr "Редакция на заявката на място" #: libraries/common.lib.php:1216 +msgctxt "Inline edit query" msgid "Inline" msgstr "На място" diff --git a/po/bn.po b/po/bn.po index 1265984..b28c51e 100644 --- a/po/bn.po +++ b/po/bn.po @@ -2688,6 +2688,7 @@ msgstr "" #: libraries/common.lib.php:1216 #, fuzzy #| msgid "Engines" +msgctxt "Inline edit query" msgid "Inline" msgstr "ইঞ্জিনসমূহ" diff --git a/po/br.po b/po/br.po index 596218d..43d4f69 100644 --- a/po/br.po +++ b/po/br.po @@ -2541,6 +2541,7 @@ msgid "Inline edit of this query" msgstr "Kemmañ ar reked-mañ enlinenn" #: libraries/common.lib.php:1216 +msgctxt "Inline edit query" msgid "Inline" msgstr "Enlinenn" diff --git a/po/bs.po b/po/bs.po index cdafb64..3bd8d18 100644 --- a/po/bs.po +++ b/po/bs.po @@ -2646,6 +2646,7 @@ msgid "Inline edit of this query" msgstr "" #: libraries/common.lib.php:1216 +msgctxt "Inline edit query" msgid "Inline" msgstr "" diff --git a/po/ca.po b/po/ca.po index 72c47de..e179c2d 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2612,6 +2612,7 @@ msgid "Inline edit of this query" msgstr "Editar aquesta consulta en línia" #: libraries/common.lib.php:1216 +msgctxt "Inline edit query" msgid "Inline" msgstr "En línia" diff --git a/po/cs.po b/po/cs.po index 9fd305e..34a1ed1 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2514,6 +2514,7 @@ msgid "Inline edit of this query" msgstr "Upravit tento dotaz na této stránce" #: libraries/common.lib.php:1216 +msgctxt "Inline edit query" msgid "Inline" msgstr "Upravit zde" diff --git a/po/cy.po b/po/cy.po index cc42899..f70b6a6 100644 --- a/po/cy.po +++ b/po/cy.po @@ -2634,6 +2634,7 @@ msgid "Inline edit of this query" msgstr "Golygu mewnol yr ymholiad hwn" #: libraries/common.lib.php:1216 +msgctxt "Inline edit query" msgid "Inline" msgstr "Mewnol" diff --git a/po/da.po b/po/da.po index 684dd86..7c91f3a 100644 --- a/po/da.po +++ b/po/da.po @@ -2575,6 +2575,7 @@ msgid "Inline edit of this query" msgstr "Åben linje til redigering af forespørgslen" #: libraries/common.lib.php:1216 +msgctxt "Inline edit query" msgid "Inline" msgstr "I linje" diff --git a/po/de.po b/po/de.po index 3f5806a..47be5ab 100644 --- a/po/de.po +++ b/po/de.po @@ -2562,6 +2562,7 @@ msgid "Inline edit of this query" msgstr "Inline-Bearbeiten dieses SQL-Befehls" #: libraries/common.lib.php:1216 +msgctxt "Inline edit query" msgid "Inline" msgstr "Inline" diff --git a/po/el.po b/po/el.po index 9993028..0da223e 100644 --- a/po/el.po +++ b/po/el.po @@ -2575,6 +2575,7 @@ msgid "Inline edit of this query" msgstr "Εσωτερική Inline edit of this query" сто" " title="<?php echo __('Filter tables by name'); ?>" value="<?php echo __('Filter tables by name'); ?>" /> ���d+ 0��� � ղd+ ��� ���� k��d+ 6 � �! �! ���� 0��� xIJ�d+ ��� ��d+ ���d+ ���� `�d+ ���� ���d+ u���d+ ��d+ ش�d+ ���d+ ���d+ xIJ�d+ ��� ���� k��d+ �! �! ���� 0��� H���d+ ��� ��d+ ���d+ ���� `�d+ ���� ���� ���� 8��d+ �p� 0��� u���d+ ���d+ ��� ���� k��d+ G H I J K M N O P ���� 0��� HEi�d+ ���� ��d+ ���d+ ���� 0��d+ u���d+ в�d+ �yF�d+ ��d+ ش�d+ ���d+ ���d+ HEi�d+ ���� ���� k��d+ 8Ei�d+ ���� ��� k��d+ (Ei�d+ ���� @��� k��d+ Ei�d+ ���� p��� k��d+ ���d+ u���d+ ���d+ ���� ��F�d+ e���d+ ش�d+ ��� y�F�d+ e���d+ ��d+ @��� Z�F�d+ e���d+ �tF�d+ в�d+ �yF�d+ ��d+ �Բ�d+ ش�d+ ���d+ ���d+ 8��d+ =�d+ 0��� pF�d+ ���� ���� k��d+ 5 6 7 8 : <