From 6261292ab4be02f2d552f1531a70654d178aa67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 9 Jul 2014 15:52:04 +0200 Subject: [PATCH 1/7] Translated using Weblate (Czech) Currently translated at 99.9% (2766 of 2768) --- po/cs.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/cs.po b/po/cs.po index 81bd2caf3d..21a8ee2bcf 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-06-11 09:42+0200\n" +"PO-Revision-Date: 2014-07-09 15:52+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: Czech \n" "Language: cs\n" @@ -1888,10 +1888,9 @@ msgid "You can also edit most values
by clicking directly on them." msgstr "Většinu polí můžete přímo upravit
kliknutím na jejich obsah." #: js/messages.php:365 -#, fuzzy #| msgid "Go to link." msgid "Go to link:" -msgstr "Přejít na odkaz." +msgstr "Přejít na odkaz:" #: js/messages.php:366 msgid "Copy column name." From fb87fc62d7d791b31e873b490d3db8004d2c9877 Mon Sep 17 00:00:00 2001 From: Aputsiaq Niels Janussen Date: Thu, 10 Jul 2014 16:29:26 +0200 Subject: [PATCH 2/7] Translated using Weblate (Danish) Currently translated at 100.0% (2768 of 2768) --- po/da.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/da.po b/po/da.po index 4a209e9009..182a0b248b 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-07-08 13:26+0200\n" +"PO-Revision-Date: 2014-07-10 16:29+0200\n" "Last-Translator: Aputsiaq Niels Janussen \n" "Language-Team: Danish \n" "Language: da\n" @@ -1860,9 +1860,9 @@ msgid "" "Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC.
- Control+Click to remove column from ORDER BY clause" msgstr "" -"Skift+ḱlik for at tilføje denne kolonne til SORTÉR EFTER-klausulen eller " -"skifte mellem TILTAGENDE/AFTAGENDE.
- Ctrl+klik for at fjerne kolonne " -"fra SORTÉR EFTER-klausul" +"Skift+ḱlik for at tilføje denne kolonne til klausulen ORDER BY eller skifte " +"mellem tiltagende og aftagende, ASC/DESC.
- Ctrl+klik for at fjerne " +"kolonne fra klausulen ORDER BY" #: js/messages.php:346 msgid "Click to mark/unmark." @@ -2571,7 +2571,7 @@ msgstr "Gem redigerede data" #: libraries/DisplayResults.class.php:747 msgid "Restore column order" -msgstr "Gendan kolonneorden" +msgstr "Gendan kolonnerækkefølge" #: libraries/DisplayResults.class.php:795 msgid "Filter rows" @@ -5071,7 +5071,7 @@ msgstr "" #: libraries/config/messages.inc.php:205 msgid "Foreign key dropdown order" -msgstr "Orden af fremmednøgler i valgboks" +msgstr "Rækkefølge for fremmednøgler i valgboks" #: libraries/config/messages.inc.php:207 msgid "A dropdown will be used if fewer items are present." From 5c4b19e94bbff1edd2a4cca796aa720ff3cdc5e9 Mon Sep 17 00:00:00 2001 From: Jan Erik Zassenhaus Date: Thu, 10 Jul 2014 13:01:09 +0200 Subject: [PATCH 3/7] Translated using Weblate (German) Currently translated at 93.8% (2599 of 2768) --- po/de.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 98b287d78f..6d34e56143 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-06-09 16:32+0200\n" -"Last-Translator: Yasar \n" +"PO-Revision-Date: 2014-07-10 13:01+0200\n" +"Last-Translator: Jan Erik Zassenhaus \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -12785,10 +12785,9 @@ msgid "The column name '%s' is a MySQL reserved keyword." msgstr "Der Spaltenname '%s' ist ein reserviertes MySQL-Schlüsselwort." #: libraries/structure.lib.php:2754 -#, fuzzy #| msgid "Add this series" msgid "Add to Favorites" -msgstr "Diese Serie hinzufügen" +msgstr "Zu den Favoriten hinzufügen" #: libraries/tbl_chart.lib.php:39 msgctxt "Chart type" From 8caaa4df400d9f2b7c57953341767c82660df5f5 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Tue, 8 Jul 2014 16:41:08 +0200 Subject: [PATCH 4/7] Translated using Weblate (Interlingua) Currently translated at 55.0% (1524 of 2768) --- po/ia.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/ia.po b/po/ia.po index 4f4d12d1eb..ca8fa5a049 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-07-07 13:29+0200\n" +"PO-Revision-Date: 2014-07-08 16:41+0200\n" "Last-Translator: Giovanni Sora \n" -"Language-Team: Interlingua \n" +"Language-Team: Interlingua " +"\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1929,10 +1929,9 @@ msgstr "" "illos." #: js/messages.php:365 -#, fuzzy #| msgid "Go to link." msgid "Go to link:" -msgstr "Vade al ligamine." +msgstr "Vade al ligamine:" #: js/messages.php:366 msgid "Copy column name." From b4c107baba5227cd96477922c5495bdedef988ad Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 9 Jul 2014 12:20:03 +0200 Subject: [PATCH 5/7] Translated using Weblate (Traditional Chinese) Currently translated at 99.8% (2765 of 2768) --- po/zh_TW.po | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 1f1fb657be..ca8c747e77 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-06-26 18:51+0200\n" -"Last-Translator: Chien Wei Lin \n" -"Language-Team: Traditional Chinese \n" +"PO-Revision-Date: 2014-07-09 12:20+0200\n" +"Last-Translator: Peter Dave Hello \n" +"Language-Team: Traditional Chinese " +"\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1806,7 +1806,7 @@ msgstr "使用拖曳來重新排序。" #: js/messages.php:344 msgid "Click to sort results by this column." -msgstr "" +msgstr "使用本欄位進行資料排序。" #: js/messages.php:345 msgid "" @@ -1850,10 +1850,9 @@ msgid "You can also edit most values
by clicking directly on them." msgstr "您可以直接點選數值
以進行編輯修改。" #: js/messages.php:365 -#, fuzzy #| msgid "Go to link." msgid "Go to link:" -msgstr "前往此連結。" +msgstr "前往此連結：" #: js/messages.php:366 msgid "Copy column name." @@ -5949,7 +5948,7 @@ msgstr "資料表偏好設定的儲存最大值" #, fuzzy #| msgid "See slave status table" msgid "QBE saved searches table" -msgstr "查看次要伺服器狀態" +msgstr "使用範例查詢(QBE)已儲存的搜尋資料表" #: libraries/config/messages.inc.php:615 #, fuzzy @@ -5959,7 +5958,7 @@ msgstr "查看次要伺服器狀態" msgid "" "Leave blank for no QBE saved searches support, suggested: [kbd]" "pma__savedsearches[/kbd]." -msgstr "不使用 PDF 大綱功能請留空，建議值: [kbd]pma__pdf_pages[/kbd]。" +msgstr "不使用 QBE 查詢功能請留空，建議值：[kbd]pma__savedsearches[/kbd]。" #: libraries/config/messages.inc.php:619 msgid "Try to connect without password." From 9a79d8703232854e51c6980670aadcfbcf6f071c Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 10 Jul 2014 23:28:31 +0200 Subject: [PATCH 6/7] Translated using Weblate (Slovenian) Currently translated at 100.0% (2768 of 2768) --- po/sl.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/po/sl.po b/po/sl.po index ce4f333570..5d910edc96 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-07-04 21:56+0200\n" +"PO-Revision-Date: 2014-07-10 23:28+0200\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian " +"\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3;\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3;\n" "X-Generator: Weblate 1.10-dev\n" #: changelog.php:36 license.php:28 @@ -1858,13 +1858,15 @@ msgstr "Povlecite za preureditev." #: js/messages.php:344 msgid "Click to sort results by this column." -msgstr "" +msgstr "Kliknite, da razvrstite rezultate po tem stolpcu." #: js/messages.php:345 msgid "" "Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC.
- Control+Click to remove column from ORDER BY clause" msgstr "" +"Shift+klik, da dodate stolpec v stavek ORDER BY ali da preklopite ASC/DESC.<" +"br />- Control+klik, da stolpec odstranite iz stavka ORDER BY" #: js/messages.php:346 msgid "Click to mark/unmark." @@ -1904,10 +1906,9 @@ msgid "You can also edit most values
by clicking directly on them." msgstr "Večino vrednosti lahko urejate
neposredno s klikom na njih." #: js/messages.php:365 -#, fuzzy #| msgid "Go to link." msgid "Go to link:" -msgstr "Pojdi na povezavo." +msgstr "Pojdi na povezavo:" #: js/messages.php:366 msgid "Copy column name." From ce72213095c5baecc328b6261859f5510d941227 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 11 Jul 2014 15:45:31 -0400 Subject: [PATCH 7/7] bug #4489 Incorrect detection of privileges for routine creation Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/rte/rte_footer.lib.php | 15 +++++---------- libraries/rte/rte_list.lib.php | 2 -- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6027e04dec..4b8a30a11d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug #4485 Sorting breaks the copy column feature - bug #4440 Javascript error when renaming table - bug #4483 'New window' link (selflink) disappears, causing Javascript error +- bug #4489 Incorrect detection of privileges for routine creation 4.2.5.0 (2014-06-26) - bug #4467 shell_exec() has been disabled for security reasons diff --git a/libraries/rte/rte_footer.lib.php b/libraries/rte/rte_footer.lib.php index 1ae765e440..9fe85f49a5 100644 --- a/libraries/rte/rte_footer.lib.php +++ b/libraries/rte/rte_footer.lib.php @@ -28,16 +28,11 @@ function PMA_RTE_getFooterLinks($docu, $priv, $name) $retval .= "
\n"; $retval .= "" . _pgettext('Create new procedure', 'New') . "\n"; $retval .= "
\n"; - if (PMA_Util::currentUserHasPrivilege($priv, $db)) { - $retval .= " \n"; - } else { - $retval .= " " . PMA_Util::getIcon($icon); - $retval .= PMA_RTE_getWord('no_create') . "\n"; - } + $retval .= " \n"; $retval .= " " . PMA_Util::showMySQLDocu($docu) . "\n"; $retval .= "
\n"; $retval .= "
\n"; diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php index e6d119bffd..f491e19bdd 100644 --- a/libraries/rte/rte_list.lib.php +++ b/libraries/rte/rte_list.lib.php @@ -148,8 +148,6 @@ function PMA_RTN_getRowForList($routine, $rowclass = '') $retval .= " \n"; $retval .= " \n"; if ($routine['ROUTINE_DEFINITION'] !== null - && PMA_Util::currentUserHasPrivilege('ALTER ROUTINE', $db) - && PMA_Util::currentUserHasPrivilege('CREATE ROUTINE', $db) ) { $retval .= '