From 0446f3c29468e2d071dce1742e5c7cf4f961c079 Mon Sep 17 00:00:00 2001 From: Jan Erik Zassenhaus Date: Wed, 26 Nov 2014 14:51:51 +0100 Subject: [PATCH 1/3] Translated using Weblate (German) Currently translated at 99.8% (2974 of 2978 strings) [CI skip] --- po/de.po | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/po/de.po b/po/de.po index 28cdcd735c..e08969c3a6 100644 --- a/po/de.po +++ b/po/de.po @@ -4,16 +4,16 @@ 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-11-13 11:57-0500\n" -"PO-Revision-Date: 2014-11-07 07:51+0200\n" -"Last-Translator: Michael Koch \n" -"Language-Team: German \n" +"PO-Revision-Date: 2014-11-26 14:51+0200\n" +"Last-Translator: Jan Erik Zassenhaus \n" +"Language-Team: German " +"\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.0\n" +"X-Generator: Weblate 2.1-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -33,10 +33,10 @@ msgid "Click to sort." msgstr "Zum Sortieren klicken." #: db_central_columns.php:125 -#, fuzzy, php-format +#, php-format #| msgid "Showing row(s) %1$s - %2$s" msgid "Showing rows %1$s - %2$s." -msgstr "Zeige Datensätze %1$s - %2$s" +msgstr "Zeige Datensätze %1$s - %2$s." #: db_create.php:61 #, php-format @@ -910,8 +910,8 @@ msgstr "" msgid "" "Or alternately go to 'Operations' tab of any database to set it up there." msgstr "" -"Oder gehen Sie auf den Tab 'Operationen' in jeder Datenbank um dies zu " -"konfigurieren." +"Oder wechseln Sie in einer beliebigen Datenbank zum Reiter „Operationen“ um " +"die Einstellung vorzunehmen." #: index.php:572 #, php-format @@ -2252,6 +2252,8 @@ msgid "" "Do you really want to see all of the rows? For a big table this could crash " "the browser." msgstr "" +"Sollen wirklich alle Datensätze angezeigt werden? Bei einer großen Tabelle " +"könnte dies den Browser zum Absturz bringen." #: js/messages.php:436 msgid "cancel" @@ -6852,6 +6854,7 @@ msgstr "" "pma__pdf_pages[/kbd]." #: libraries/config/messages.inc.php:622 +#, fuzzy msgid "PDF schema: pages table" msgstr "PDF Pages Table" @@ -9987,7 +9990,6 @@ msgstr "" "(4,5,6), (7,8,9)" #: libraries/plugins/export/ExportSql.class.php:403 -#, fuzzy #| msgid "" #| "both of the above
      Example: INSERT INTO " #| "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)" @@ -9995,9 +9997,9 @@ msgid "" "both of the above
      Example: INSERT INTO " "tbl_name (col_A,col_B,col_C) VALUES (1,2,3), (4,5,6), (7,8,9)" msgstr "" -"beide obigen Optionen verwenden
      Beispiel: " -"INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)" +"beide obigen Optionen verwenden
      Beispiel: " +"INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3), (4,5,6), " +"(7,8,9)" #: libraries/plugins/export/ExportSql.class.php:408 msgid "" @@ -11794,7 +11796,7 @@ msgstr "" #: libraries/server_privileges.lib.php:1299 #: libraries/server_privileges.lib.php:2498 msgid "Login Information" -msgstr "Anmelde-Informationen" +msgstr "Anmeldeinformationen" #: libraries/server_privileges.lib.php:1332 #: libraries/server_privileges.lib.php:1520 @@ -13973,10 +13975,9 @@ msgid "Choose column to display:" msgstr "Anzuzeigende Spalte auswählen:" #: libraries/tbl_relation.lib.php:816 -#, fuzzy #| msgid "Thread %s was successfully killed." msgid "Display column was successfully updated." -msgstr "Der Thread %s wurde erfolgreich abgebrochen." +msgstr "Spaltendarstellung erfolgreich aktualisiert." #: libraries/tbl_relation.lib.php:900 #, fuzzy From e08383ba2541a9c596bb51fe6f4d56789e63fab4 Mon Sep 17 00:00:00 2001 From: Danilo GUia Date: Wed, 26 Nov 2014 18:30:48 +0100 Subject: [PATCH 2/3] Translated using Weblate (Portuguese (Brazil)) Currently translated at 93.9% (2797 of 2978 strings) [CI skip] --- po/pt_BR.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 5e897f337c..ea534dd86f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-11-13 11:57-0500\n" -"PO-Revision-Date: 2014-11-05 10:18+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2014-11-26 18:30+0200\n" +"Last-Translator: Danilo GUia \n" +"Language-Team: Portuguese (Brazil) " +"\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.0-dev\n" +"X-Generator: Weblate 2.1-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -1941,7 +1941,7 @@ msgstr "As seguintes ações serão executadas:" #: js/messages.php:330 #, php-format msgid "DROP columns %s from the table %s" -msgstr "" +msgstr "APAGAR colunas %s da tabela %s" #: js/messages.php:331 msgid "Create the following table" From 19802ca9f9cb12c3dd9034a0928f2c417bf91d30 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 27 Nov 2014 10:25:42 +0530 Subject: [PATCH 3/3] bug #4608 SELECT permission issues with relations and restricted access Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/relation.lib.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d9acb015f6..8e035849bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug #4605 Unseen messages in tracking - bug #4606 Tracking report export as SQL dump does not work - bug #4607 Syntax error during db_copy operation +- bug #4608 SELECT permission issues with relations and restricted access 4.2.12.0 (2014-11-20) - bug #4574 Blank/white page when JavaScript disabled diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index ba755d6ef5..c9996ca0da 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1248,7 +1248,7 @@ function PMA_getForeignData( } } - $disp = $GLOBALS['dbi']->query( + $disp = $GLOBALS['dbi']->tryQuery( $f_query_main . $f_query_from . $f_query_filter . $f_query_order . $f_query_limit ); @@ -1262,6 +1262,12 @@ function PMA_getForeignData( $disp_row[] = $single_disp_row; } @$GLOBALS['dbi']->freeResult($disp); + } else { + // Either no data in the foreign table or + // user does not have select permission to foreign table/field + // Show an input field with a 'Browse foreign values' link + $disp_row = null; + $foreign_link = true; } } else { $disp_row = null;