From b12411cc2466639e7684c8414e65e19b8d170cc7 Mon Sep 17 00:00:00 2001 From: Pavel Rochnyack Date: Wed, 3 Aug 2016 09:57:27 +0100 Subject: [PATCH 1/6] Fix header in User Properties editor Signed-off-by: Pavel Rochnyack --- libraries/server_privileges.lib.php | 19 ++++++++++++------- test/libraries/PMA_server_privileges_test.php | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 2a00fc9967..b671a1b148 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -974,7 +974,9 @@ function PMA_getHtmlForRoutineSpecificPrivilges( $username, $hostname, $db, $routine, $url_dbname ) { $header = PMA_getHtmlHeaderForUserProperties( - false, $url_dbname, $db, $username, $hostname, $routine + false, $url_dbname, $db, $username, $hostname, + '', /* Tablename */ + $routine ); $sql = "SELECT `Proc_priv`" @@ -1094,7 +1096,7 @@ function PMA_getHtmlForTableSpecificPrivileges( . '' . "\n" . '
' . "\n" - . '' . __('Table-specific privileges') + . '' . __('Table-specific privileges') . '' . '

' . __('Note: MySQL privilege names are expressed in English.') @@ -4573,7 +4575,8 @@ function PMA_getAddUserHtmlFieldset($db = '', $table = '') * @return string $html_output */ function PMA_getHtmlHeaderForUserProperties( - $dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, $tablename + $dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, $tablename, + $routinename ) { $html_output = '

' . "\n" . Util::getIcon('b_usredit.png') @@ -4599,7 +4602,7 @@ function PMA_getHtmlHeaderForUserProperties( $html_output .= ($dbname_is_wildcard || is_array($dbname) && count($dbname) > 1) ? __('Databases') : __('Database'); - if (! empty($_REQUEST['tablename'])) { + if (! empty($tablename)) { $html_output .= ' '; $html_output .= ' - ' . __('Routine') - . ' ' . htmlspecialchars($tablename) . ''; + . ' ' . htmlspecialchars($routinename) . ''; } else { if (! is_array($dbname)) { $dbname = array($dbname); @@ -4840,7 +4843,9 @@ function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname, ) { $html_output = '
'; $html_output .= PMA_getHtmlHeaderForUserProperties( - $dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, $tablename + $dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, + $tablename, + '' /* Routinename */ ); $sql = "SELECT '1' FROM `mysql`.`user`" diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index 62c9030cd1..c3de28b983 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -1962,7 +1962,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $html = PMA_getHtmlHeaderForUserProperties( $dbname_is_wildcard, $url_dbname, $dbname, - $username, $hostname, $tablename + $username, $hostname, $tablename, '' /* Routinename */ ); //title From b83b71d5a555857299b50a097155307028915941 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 10 Nov 2016 13:06:02 +0000 Subject: [PATCH 2/6] Translated using Weblate (Turkish) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] --- po/tr.po | 76 ++++++++++++++++++++------------------------------------ 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/po/tr.po b/po/tr.po index f6929b49cd..8a34e58f38 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-11-10 09:39+0100\n" -"PO-Revision-Date: 2016-10-27 05:31+0000\n" +"PO-Revision-Date: 2016-11-10 13:06+0000\n" "Last-Translator: Burak Yavuz \n" -"Language-Team: Turkish \n" +"Language-Team: Turkish " +"\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.9-dev\n" +"X-Generator: Weblate 2.9\n" #: changelog.php:38 license.php:33 #, php-format @@ -1554,7 +1554,7 @@ msgstr "Kelime/düzenli ifadeye göre sorguları süz:" #: js/messages.php:299 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "Grup sorguları, WHERE cümleciklerindeki değişken veri yoksayılıyor" +msgstr "Grup sorguları, WHERE yan tümcelerindeki değişken veri yoksayılıyor" #: js/messages.php:300 msgid "Sum of grouped rows:" @@ -2176,15 +2176,11 @@ msgstr "" "doğrudan istendiğinde bu değerler içindeki anahtarı" #: js/messages.php:528 -#, fuzzy -#| msgid "" -#| "MySQL accepts additional values not selectable by the slider; key in " -#| "those values directly if desired" msgid "" "MySQL accepts additional values not selectable by the datepicker; key in " "those values directly if desired" msgstr "" -"MySQL, kaydırıcı tarafından seçilebilir olmayan ek değerleri kabul eder; " +"MySQL, datepicker tarafından seçilebilir olmayan ek değerleri kabul eder; " "doğrudan istendiğinde bu değerler içindeki anahtarı" #: js/messages.php:534 @@ -2311,9 +2307,9 @@ msgid "" ">- Ctrl+Click or Alt+Click (Mac: Shift+Option+Click) to remove column from " "ORDER BY clause" msgstr "" -"Bu sütunu ORDER BY ibaresine eklemek ya da ASC/DESC değiştirmek için Shift" -"+Tıklayın.
- Sütunu ORDER BY ibaresinden kaldırmak için Ctrl+Tıklayın " -"ya da Alt+Tıklayın (Mac: Shift+Option+Tıklayın)" +"Bu sütunu ORDER BY yan tümcesine eklemek ya da ASC/DESC değiştirmek için " +"Shift+Tıklayın.
- Sütunu ORDER BY yan tümcesinden kaldırmak için Ctrl+" +"Tıklayın ya da Alt+Tıklayın (Mac: Shift+Option+Tıklayın)" #: js/messages.php:580 msgid "Click to mark/unmark." @@ -11883,40 +11879,31 @@ msgid "routine" msgstr "yordam" #: libraries/rte/rte_words.lib.php:32 -#, fuzzy -#| msgid "You do not have the necessary privileges to create a routine" msgid "You do not have the necessary privileges to create a routine." -msgstr "Bir yordam oluşturmak için gerekli yetkilere sahip değilsiniz" +msgstr "Bir yordam oluşturmak için gerekli yetkilere sahip değilsiniz." #: libraries/rte/rte_words.lib.php:35 -#, fuzzy, php-format -#| msgid "" -#| "No routine with name %1$s found in database %2$s. You might be lacking " -#| "the necessary privileges to edit this routine" +#, php-format msgid "" "No routine with name %1$s found in database %2$s. You might be lacking the " "necessary privileges to edit this routine." msgstr "" "%2$s veritabanında bulunan %1$s adında yordam yok. Bu yordamı düzenlemek " -"için gerekli yetkiler yetersiz olabilir" +"için gerekli yetkiler yetersiz olabilir." #: libraries/rte/rte_words.lib.php:39 -#, fuzzy, php-format -#| msgid "" -#| "No routine with name %1$s found in database %2$s. You might be lacking " -#| "the necessary privileges to view/export this routine" +#, php-format msgid "" "No routine with name %1$s found in database %2$s. You might be lacking the " "necessary privileges to view/export this routine." msgstr "" "%2$s veritabanında bulunan %1$s adında yordam yok. Bu yordamı görüntülemek/" -"dışa aktarmak için gerekli yetkiler yetersiz olabilir" +"dışa aktarmak için gerekli yetkiler yetersiz olabilir." #: libraries/rte/rte_words.lib.php:42 -#, fuzzy, php-format -#| msgid "No routine with name %1$s found in database %2$s" +#, php-format msgid "No routine with name %1$s found in database %2$s." -msgstr "%1$s veritabanında %2$s adıyla yordam bulunamadı" +msgstr "%1$s veritabanında %2$s adıyla yordam bulunamadı." #: libraries/rte/rte_words.lib.php:43 msgid "There are no routines to display." @@ -11936,16 +11923,13 @@ msgid "trigger" msgstr "trigger" #: libraries/rte/rte_words.lib.php:54 -#, fuzzy -#| msgid "You do not have the necessary privileges to create a trigger" msgid "You do not have the necessary privileges to create a trigger." -msgstr "Bir tetikleyici oluşturmak için gerekli yetkilere sahip değilsiniz" +msgstr "Bir tetikleyici oluşturmak için gerekli yetkilere sahip değilsiniz." #: libraries/rte/rte_words.lib.php:56 -#, fuzzy, php-format -#| msgid "No trigger with name %1$s found in database %2$s" +#, php-format msgid "No trigger with name %1$s found in database %2$s." -msgstr "%2$s veritabanında %1$s adıyla tetikleyici bulunamadı" +msgstr "%2$s veritabanında %1$s adıyla tetikleyici bulunamadı." #: libraries/rte/rte_words.lib.php:57 msgid "There are no triggers to display." @@ -11965,16 +11949,13 @@ msgid "event" msgstr "olay" #: libraries/rte/rte_words.lib.php:68 -#, fuzzy -#| msgid "You do not have the necessary privileges to create an event" msgid "You do not have the necessary privileges to create an event." -msgstr "Bir olay oluşturmak için gerekli yetkilere sahip değilsiniz" +msgstr "Bir olay oluşturmak için gerekli yetkilere sahip değilsiniz." #: libraries/rte/rte_words.lib.php:70 -#, fuzzy, php-format -#| msgid "No event with name %1$s found in database %2$s" +#, php-format msgid "No event with name %1$s found in database %2$s." -msgstr "%2$s veritabanında %1$s adıyla olay bulunamadı" +msgstr "%2$s veritabanında %1$s adıyla olay bulunamadı." #: libraries/rte/rte_words.lib.php:71 msgid "There are no events to display." @@ -13783,16 +13764,12 @@ msgid "Unexpected end of CASE expression" msgstr "Beklenmedik Büyük/Küçük harf ifadesi sonu" #: libraries/sql-parser/src/Components/CreateDefinition.php:227 -#, fuzzy -#| msgid "" -#| "A symbol name was expected! A reserved keyword can not be used as a field " -#| "name without backquotes." msgid "" "A symbol name was expected! A reserved keyword can not be used as a column " "name without backquotes." msgstr "" "Bir sembol adı beklenmekte! Ayrılmış bir anahtar kelime ters eğik tırnakları " -"olmadan bir alan adı olarak kullanılamaz." +"olmadan bir sütun adı olarak kullanılamaz." #: libraries/sql-parser/src/Components/CreateDefinition.php:241 msgid "A symbol name was expected!" @@ -13912,10 +13889,8 @@ msgid "Unrecognized keyword." msgstr "Tanınmayan anahtar kelime." #: libraries/sql-parser/src/Statement.php:457 -#, fuzzy -#| msgid "Unexpected beginning of statement." msgid "Unexpected ordering of clauses." -msgstr "Beklenmedik ifade başlangıcı." +msgstr "Beklenmedik yan tümce sıralaması." #: libraries/sql-parser/src/Statements/CreateStatement.php:381 msgid "The name of the entity was expected." @@ -15406,6 +15381,9 @@ msgid "" "an index on it. Alternatively, you can define an index below, before " "creating the foreign key." msgstr "" +"Bir indekslenmemiş sütun üzerinde dış anahtar oluşturmak otomatik olarak bir " +"indeks oluşturmaktadır. Alternatif olarak, dış anahtar oluşturmadan önce, " +"aşağıda bir dizin tanımlayabilirsiniz." #: templates/table/relation/common_form.phtml:20 msgid "" From 35c7c8039fbfc5680584f01f596d5ea47294369c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?= =?UTF-8?q?=CF=82=20=CE=A0=CE=B1=CF=80=CE=AC=CE=B6=CE=BF=CE=B3=CE=BB=CE=BF?= =?UTF-8?q?=CF=85?= Date: Thu, 10 Nov 2016 17:32:06 +0000 Subject: [PATCH 3/6] Translated using Weblate (Greek) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] --- po/el.po | 70 +++++++++++++++++++------------------------------------- 1 file changed, 24 insertions(+), 46 deletions(-) diff --git a/po/el.po b/po/el.po index d894b87a86..f9db88eaf7 100644 --- a/po/el.po +++ b/po/el.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-11-10 09:39+0100\n" -"PO-Revision-Date: 2016-10-25 10:17+0000\n" +"PO-Revision-Date: 2016-11-10 17:32+0000\n" "Last-Translator: Παναγιώτης Παπάζογλου \n" -"Language-Team: Greek \n" +"Language-Team: Greek " +"\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.9-dev\n" +"X-Generator: Weblate 2.9\n" #: changelog.php:38 license.php:33 #, php-format @@ -2195,16 +2195,12 @@ msgstr "" "δώστε κλειδί σε αυτές τιμές άμεσα, αν το επιθυμείτε" #: js/messages.php:528 -#, fuzzy -#| msgid "" -#| "MySQL accepts additional values not selectable by the slider; key in " -#| "those values directly if desired" msgid "" "MySQL accepts additional values not selectable by the datepicker; key in " "those values directly if desired" msgstr "" -"Η MySQL αποδέχεται πρόσθετες τιμές που δεν είναι επιλέξιμες από την κύλιση, " -"δώστε κλειδί σε αυτές τιμές άμεσα, αν το επιθυμείτε" +"Η MySQL αποδέχεται πρόσθετες τιμές που δεν είναι επιλέξιμες από τον επιλογέα " +"ημερομηνίας, δώστε κλειδί σε αυτές τιμές άμεσα, αν το επιθυμείτε" #: js/messages.php:534 msgid "" @@ -11999,40 +11995,31 @@ msgid "routine" msgstr "ρουτίνα" #: libraries/rte/rte_words.lib.php:32 -#, fuzzy -#| msgid "You do not have the necessary privileges to create a routine" msgid "You do not have the necessary privileges to create a routine." -msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε μια ρουτίνα" +msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε μια ρουτίνα." #: libraries/rte/rte_words.lib.php:35 -#, fuzzy, php-format -#| msgid "" -#| "No routine with name %1$s found in database %2$s. You might be lacking " -#| "the necessary privileges to edit this routine" +#, php-format msgid "" "No routine with name %1$s found in database %2$s. You might be lacking the " "necessary privileges to edit this routine." msgstr "" "Καμιά ρουτίνα με το όνομα %1$s δεν βρέθηκε στη βάση δεδομένων %2$s. Ίσως δεν " -"έχετε τα απαραίτητα δικαιώματα για επεξεργασία της ρουτίνας" +"έχετε τα απαραίτητα δικαιώματα για επεξεργασία της ρουτίνας." #: libraries/rte/rte_words.lib.php:39 -#, fuzzy, php-format -#| msgid "" -#| "No routine with name %1$s found in database %2$s. You might be lacking " -#| "the necessary privileges to view/export this routine" +#, php-format msgid "" "No routine with name %1$s found in database %2$s. You might be lacking the " "necessary privileges to view/export this routine." msgstr "" "Καμιά ρουτίνα με το όνομα %1$s δεν βρέθηκε στη βάση δεδομένων %2$s. Ίσως δεν " -"έχετε τα απαραίτητα δικαιώματα για προβολή/εξάγωγή της ρουτίνας" +"έχετε τα απαραίτητα δικαιώματα για προβολή/εξάγωγή της ρουτίνας." #: libraries/rte/rte_words.lib.php:42 -#, fuzzy, php-format -#| msgid "No routine with name %1$s found in database %2$s" +#, php-format msgid "No routine with name %1$s found in database %2$s." -msgstr "Καμιά ρουτίνα με την ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s" +msgstr "Καμιά ρουτίνα με την ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s." #: libraries/rte/rte_words.lib.php:43 msgid "There are no routines to display." @@ -12052,17 +12039,14 @@ msgid "trigger" msgstr "ενέργεια" #: libraries/rte/rte_words.lib.php:54 -#, fuzzy -#| msgid "You do not have the necessary privileges to create a trigger" msgid "You do not have the necessary privileges to create a trigger." -msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε μια ενέργεια" +msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε μια ενέργεια." #: libraries/rte/rte_words.lib.php:56 -#, fuzzy, php-format -#| msgid "No trigger with name %1$s found in database %2$s" +#, php-format msgid "No trigger with name %1$s found in database %2$s." msgstr "" -"Καμιά ενέργεια με την ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s" +"Καμιά ενέργεια με την ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s." #: libraries/rte/rte_words.lib.php:57 msgid "There are no triggers to display." @@ -12082,16 +12066,13 @@ msgid "event" msgstr "συμβάν" #: libraries/rte/rte_words.lib.php:68 -#, fuzzy -#| msgid "You do not have the necessary privileges to create an event" msgid "You do not have the necessary privileges to create an event." -msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε ένα συμβάν" +msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να δημιουργήσετε ένα συμβάν." #: libraries/rte/rte_words.lib.php:70 -#, fuzzy, php-format -#| msgid "No event with name %1$s found in database %2$s" +#, php-format msgid "No event with name %1$s found in database %2$s." -msgstr "Κανένα συμβάν με ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s" +msgstr "Κανένα συμβάν με ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s." #: libraries/rte/rte_words.lib.php:71 msgid "There are no events to display." @@ -13954,16 +13935,12 @@ msgid "Unexpected end of CASE expression" msgstr "Μη αναμενόμενο τέλος της έκφρασης CASE" #: libraries/sql-parser/src/Components/CreateDefinition.php:227 -#, fuzzy -#| msgid "" -#| "A symbol name was expected! A reserved keyword can not be used as a field " -#| "name without backquotes." msgid "" "A symbol name was expected! A reserved keyword can not be used as a column " "name without backquotes." msgstr "" "Αναμενόταν ένα όνομα συμβόλου! Μια δεσμευμένη λέξη-κλειδί δεν μπορεί να " -"χρησιμοποιηθεί ως όνομα πεδίου χωρίς εισαγωγικά." +"χρησιμοποιηθεί ως όνομα στήλης χωρίς εισαγωγικά." #: libraries/sql-parser/src/Components/CreateDefinition.php:241 msgid "A symbol name was expected!" @@ -14083,10 +14060,8 @@ msgid "Unrecognized keyword." msgstr "Μη αναγνωρισμένη λέξη κλειδί." #: libraries/sql-parser/src/Statement.php:457 -#, fuzzy -#| msgid "Unexpected beginning of statement." msgid "Unexpected ordering of clauses." -msgstr "Μη αναμενόμενη έναρξη δήλωσης." +msgstr "Μη αναμενόμενη ταξινόμηση δηλώσεων." #: libraries/sql-parser/src/Statements/CreateStatement.php:381 msgid "The name of the entity was expected." @@ -15585,6 +15560,9 @@ msgid "" "an index on it. Alternatively, you can define an index below, before " "creating the foreign key." msgstr "" +"Δημιουργώντας ένα ξένο κλειδί σε μια στήλη χωρίς ευρετήριο θα δημιουργήσει " +"αυτόματα ένα ευρετήριο για αυτή. Εναλλακτικά, μπορείτε να ορίσετε ένα " +"ευρετήριο παρακάτω, πριν δημιουρήσετε το ξένο κλειδί." #: templates/table/relation/common_form.phtml:20 msgid "" From f7c8cd72a2611745f0bb3f44cced234c3c8414e8 Mon Sep 17 00:00:00 2001 From: dingo thirteen Date: Thu, 10 Nov 2016 18:12:51 +0000 Subject: [PATCH 4/6] Translated using Weblate (Dutch) Currently translated at 100.0% (3222 of 3222 strings) [CI skip] --- po/nl.po | 70 +++++++++++++++++++------------------------------------- 1 file changed, 24 insertions(+), 46 deletions(-) diff --git a/po/nl.po b/po/nl.po index 31da7655e6..1d1773ac62 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-11-10 09:39+0100\n" -"PO-Revision-Date: 2016-10-27 08:32+0000\n" +"PO-Revision-Date: 2016-11-10 18:13+0000\n" "Last-Translator: dingo thirteen \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch " +"\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.9-dev\n" +"X-Generator: Weblate 2.9\n" #: changelog.php:38 license.php:33 #, php-format @@ -2192,16 +2192,12 @@ msgstr "" "zijn; tik deze waardes indien gewenst rechtstreeks in" #: js/messages.php:528 -#, fuzzy -#| msgid "" -#| "MySQL accepts additional values not selectable by the slider; key in " -#| "those values directly if desired" msgid "" "MySQL accepts additional values not selectable by the datepicker; key in " "those values directly if desired" msgstr "" -"MySQL accepteert additionele waardes die niet met schuiven te selecteren " -"zijn; tik deze waardes indien gewenst rechtstreeks in" +"MySQL accepteert additionele waardes die niet met de datumprikker te " +"selecteren zijn; tik deze waardes indien gewenst rechtstreeks in" #: js/messages.php:534 msgid "" @@ -11971,40 +11967,31 @@ msgid "routine" msgstr "routine" #: libraries/rte/rte_words.lib.php:32 -#, fuzzy -#| msgid "You do not have the necessary privileges to create a routine" msgid "You do not have the necessary privileges to create a routine." -msgstr "U heeft niet voldoende rechten om een routine aan te maken" +msgstr "U hebt niet voldoende rechten om een routine aan te maken." #: libraries/rte/rte_words.lib.php:35 -#, fuzzy, php-format -#| msgid "" -#| "No routine with name %1$s found in database %2$s. You might be lacking " -#| "the necessary privileges to edit this routine" +#, php-format msgid "" "No routine with name %1$s found in database %2$s. You might be lacking the " "necessary privileges to edit this routine." msgstr "" "Geen routine met de naam %1$s gevonden in database %2$s. Je hebt mogelijk " -"niet de benodigde rechten om deze routine te wijzigen" +"niet de benodigde rechten om deze routine te wijzigen." #: libraries/rte/rte_words.lib.php:39 -#, fuzzy, php-format -#| msgid "" -#| "No routine with name %1$s found in database %2$s. You might be lacking " -#| "the necessary privileges to view/export this routine" +#, php-format msgid "" "No routine with name %1$s found in database %2$s. You might be lacking the " "necessary privileges to view/export this routine." msgstr "" "Geen routine met de naam %1$s gevonden in database %2$s. Je hebt mogelijk " -"niet de benodigde rechten om deze routine te lezen/wijzigen" +"niet de benodigde rechten om deze routine te lezen/wijzigen." #: libraries/rte/rte_words.lib.php:42 -#, fuzzy, php-format -#| msgid "No routine with name %1$s found in database %2$s" +#, php-format msgid "No routine with name %1$s found in database %2$s." -msgstr "Geen routine met naam %1$s gevonden in database %2$s" +msgstr "Geen routine met naam %1$s gevonden in database %2$s." #: libraries/rte/rte_words.lib.php:43 msgid "There are no routines to display." @@ -12024,16 +12011,13 @@ msgid "trigger" msgstr "trigger" #: libraries/rte/rte_words.lib.php:54 -#, fuzzy -#| msgid "You do not have the necessary privileges to create a trigger" msgid "You do not have the necessary privileges to create a trigger." -msgstr "U heeft niet voldoende rechten om een trigger aan te maken" +msgstr "U heeft niet voldoende rechten om een trigger aan te maken." #: libraries/rte/rte_words.lib.php:56 -#, fuzzy, php-format -#| msgid "No trigger with name %1$s found in database %2$s" +#, php-format msgid "No trigger with name %1$s found in database %2$s." -msgstr "Geen trigger met naam %1$s gevonden in database %2$s" +msgstr "Geen trigger met naam %1$s gevonden in database %2$s." #: libraries/rte/rte_words.lib.php:57 msgid "There are no triggers to display." @@ -12053,16 +12037,13 @@ msgid "event" msgstr "gebeurtenis" #: libraries/rte/rte_words.lib.php:68 -#, fuzzy -#| msgid "You do not have the necessary privileges to create an event" msgid "You do not have the necessary privileges to create an event." -msgstr "U heeft niet voldoende rechten om een gebeurtenis aan te maken" +msgstr "U heeft niet voldoende rechten om een gebeurtenis aan te maken." #: libraries/rte/rte_words.lib.php:70 -#, fuzzy, php-format -#| msgid "No event with name %1$s found in database %2$s" +#, php-format msgid "No event with name %1$s found in database %2$s." -msgstr "Geen gebeurtenis met naam %1$s gevonden in database %2$s" +msgstr "Geen gebeurtenis met naam %1$s gevonden in database %2$s." #: libraries/rte/rte_words.lib.php:71 msgid "There are no events to display." @@ -13908,16 +13889,12 @@ msgid "Unexpected end of CASE expression" msgstr "Onverwacht einde van CASE expressie" #: libraries/sql-parser/src/Components/CreateDefinition.php:227 -#, fuzzy -#| msgid "" -#| "A symbol name was expected! A reserved keyword can not be used as a field " -#| "name without backquotes." msgid "" "A symbol name was expected! A reserved keyword can not be used as a column " "name without backquotes." msgstr "" "Een symbool naam werd verwacht! Een gereserveerd sleutelwoord kan niet als " -"veldnaam gebruikt worden zonder achterwaartse aanhalingstekens." +"kolomnaam gebruikt worden zonder achterwaartse aanhalingstekens." #: libraries/sql-parser/src/Components/CreateDefinition.php:241 msgid "A symbol name was expected!" @@ -14037,10 +14014,8 @@ msgid "Unrecognized keyword." msgstr "Sleutelwoord niet herkent." #: libraries/sql-parser/src/Statement.php:457 -#, fuzzy -#| msgid "Unexpected beginning of statement." msgid "Unexpected ordering of clauses." -msgstr "Onverwacht begin van opdracht." +msgstr "Onverwachte volgorde van voorwaarden." #: libraries/sql-parser/src/Statements/CreateStatement.php:381 msgid "The name of the entity was expected." @@ -15543,6 +15518,9 @@ msgid "" "an index on it. Alternatively, you can define an index below, before " "creating the foreign key." msgstr "" +"Aanmaken van een externe sleutel voor een niet geïndexeerde kolom zou " +"automatisch een index aanmaken. Als alternatief kunt u hier beneden een " +"index definiëren voor dat u een externe sleutel aanmaakt." #: templates/table/relation/common_form.phtml:20 msgid "" From f80140c46e7e3df31dd5450b60136518b8ac1f0a Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Fri, 11 Nov 2016 19:06:37 +0530 Subject: [PATCH 5/6] Fix function parameters in b12411cc2466639e7684c8414e65e19b8d170cc7 Fix #12542 Signed-off-by: Deven Bansod --- libraries/server_privileges.lib.php | 21 +++++++++---------- test/libraries/PMA_server_privileges_test.php | 4 +++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 074982f33b..9988186900 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -975,8 +975,7 @@ function PMA_getHtmlForRoutineSpecificPrivilges( ) { $header = PMA_getHtmlHeaderForUserProperties( false, $url_dbname, $db, $username, $hostname, - '', /* Tablename */ - $routine + $routine, 'routine' ); $sql = "SELECT `Proc_priv`" @@ -4570,13 +4569,14 @@ function PMA_getAddUserHtmlFieldset($db = '', $table = '') * @param string $dbname database name * @param string $username username * @param string $hostname host name - * @param string $tablename table name + * @param string $entity_name entity (table or routine) name + * @param string $entity_type optional, type of entity ('table' or 'routine') * * @return string $html_output */ function PMA_getHtmlHeaderForUserProperties( - $dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, $tablename, - $routinename + $dbname_is_wildcard, $url_dbname, $dbname, + $username, $hostname, $entity_name, $entity_type='table' ) { $html_output = '

' . "\n" . Util::getIcon('b_usredit.png') @@ -4602,7 +4602,7 @@ function PMA_getHtmlHeaderForUserProperties( $html_output .= ($dbname_is_wildcard || is_array($dbname) && count($dbname) > 1) ? __('Databases') : __('Database'); - if (! empty($tablename)) { + if (! empty($entity_name) && $entity_type === 'table') { $html_output .= ' '; $html_output .= ' - ' . __('Routine') - . ' ' . htmlspecialchars($routinename) . ''; + . ' ' . htmlspecialchars($entity_name) . ''; } else { if (! is_array($dbname)) { $dbname = array($dbname); @@ -4844,8 +4844,7 @@ function PMA_getHtmlForUserProperties($dbname_is_wildcard,$url_dbname, $html_output = '
'; $html_output .= PMA_getHtmlHeaderForUserProperties( $dbname_is_wildcard, $url_dbname, $dbname, $username, $hostname, - $tablename, - '' /* Routinename */ + $tablename, 'table' ); $sql = "SELECT '1' FROM `mysql`.`user`" diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index c3de28b983..7f27175567 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -84,6 +84,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $GLOBALS['username'] = "username"; $GLOBALS['collation_connection'] = "collation_connection"; $GLOBALS['text_dir'] = "text_dir"; + $GLOBALS['is_reload_priv'] = true; + //$_POST $_POST['pred_password'] = 'none'; //$_SESSION @@ -1962,7 +1964,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $html = PMA_getHtmlHeaderForUserProperties( $dbname_is_wildcard, $url_dbname, $dbname, - $username, $hostname, $tablename, '' /* Routinename */ + $username, $hostname, $tablename, 'table' ); //title From d580bb3b51543b626eacc29f862364683ba5c779 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Fri, 11 Nov 2016 19:09:44 +0530 Subject: [PATCH 6/6] ChangeLog for #12542 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 6c7461e8f1..a1260c4054 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ phpMyAdmin - ChangeLog - issue #12257 Improved search page performance - issue #12322 Avoid selecting default function for foreign keys - issue #12453 Fixed escaping of SQL parts in some corner cases +- issue #12542 Missing table name in account privileges editor 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29