From 51d66de5ad9ace9580f18bc7dd23d5d3b92b87f8 Mon Sep 17 00:00:00 2001 From: Manuel Dalla Lana Date: Wed, 2 Oct 2013 13:20:33 +0200 Subject: [PATCH 1/3] Translated using Weblate (Italian) Currently translated at 93.0% (2429 of 2611) --- po/it.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/it.po b/po/it.po index b8fd2b6214..6f909f1f75 100644 --- a/po/it.po +++ b/po/it.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.7-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-09-17 10:36-0400\n" -"PO-Revision-Date: 2013-05-17 12:45+0200\n" -"Last-Translator: Andrea Falco \n" +"PO-Revision-Date: 2013-10-02 13:20+0200\n" +"Last-Translator: Manuel Dalla Lana \n" "Language-Team: Italian \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.6-dev\n" +"X-Generator: Weblate 1.7-dev\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:345 #: libraries/DisplayResults.class.php:856 @@ -573,7 +573,7 @@ msgstr "Aggiungi un punto" #: gis_data_editor.php:262 js/messages.php:314 #, fuzzy msgid "Linestring" -msgstr "Linestring" +msgstr "Linea spezzata" #: gis_data_editor.php:265 gis_data_editor.php:341 js/messages.php:318 msgid "Outer Ring" @@ -1372,7 +1372,7 @@ msgstr "Dal log generale" #: js/messages.php:159 msgid "The database name is not known for this query in the server's logs." -msgstr "" +msgstr "Il nome del database non è noto per questa query nei log del server." #: js/messages.php:160 msgid "Analysing logs" @@ -1544,7 +1544,7 @@ msgstr "Importa" #, fuzzy #| msgid "Could not import configuration" msgid "Import monitor configuration" -msgstr "Non é stato possibile caricare la configurazione" +msgstr "Importa la configurazione monitor" #: js/messages.php:202 msgid "Please select the file you want to import" @@ -1800,10 +1800,10 @@ msgid "To zoom in, select a section of the plot with the mouse." msgstr "Per effettuare lo zoom, scegliere una sezione del plot con il mouse." #: js/messages.php:296 -#, fuzzy #| msgid "Click reset zoom link to come back to original state." msgid "Click reset zoom button to come back to original state." -msgstr "Fai clic su \"Ripristina zoom\" per tornare allo stato originale." +msgstr "" +"Fai clic sul bottone \"Ripristina zoom\" per tornare allo stato originale." #: js/messages.php:298 msgid "Click a data point to view and possibly edit the data row." From c6939756452b2be10eeb93aed3ccf958020bb665 Mon Sep 17 00:00:00 2001 From: Yngve Nybakk Date: Thu, 3 Oct 2013 08:49:35 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 71.9% (1877 of 2611) --- po/nb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/nb.po b/po/nb.po index 4a3849f9c9..18c56d29d0 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.7-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-09-17 10:36-0400\n" -"PO-Revision-Date: 2013-03-26 11:59+0200\n" -"Last-Translator: Stian Berg \n" -"Language-Team: Norwegian Bokmål \n" +"PO-Revision-Date: 2013-10-03 08:49+0200\n" +"Last-Translator: Yngve Nybakk \n" +"Language-Team: Norwegian Bokmål " +"\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.5-dev\n" +"X-Generator: Weblate 1.7-dev\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:345 #: libraries/DisplayResults.class.php:856 @@ -1355,7 +1355,7 @@ msgstr "Fra generell logg" #: js/messages.php:159 msgid "The database name is not known for this query in the server's logs." -msgstr "" +msgstr "Databasenavnet er ukjent for denne spørring i serverens logger." #: js/messages.php:160 msgid "Analysing logs" From 111923f61c991f869ad4102397c165fe8f2dac85 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 5 Oct 2013 07:05:59 -0400 Subject: [PATCH 3/3] bug #4104 Can't edit updatable view when searching --- ChangeLog | 1 + sql.php | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5137ee3701..35a88c418d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.0.9.0 (not yet released) +- bug #4104 Can't edit updatable view when searching 4.0.8.0 (not yet released) - bug #3988 Rename view is not working diff --git a/sql.php b/sql.php index cfe8dea106..cd4fa4ffd3 100644 --- a/sql.php +++ b/sql.php @@ -1237,10 +1237,9 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { // hide edit and delete links: // - for information_schema // - if the result set does not contain all the columns of a unique key - // and we are not just browing all the columns of an updatable view + // (unless this is an updatable view) $updatableView - = $justBrowsing - && trim($analyzed_sql[0]['select_expr_clause']) == '*' + = trim($analyzed_sql[0]['select_expr_clause']) == '*' && PMA_Table::isUpdatableView($db, $table); $editable = $resultSetContainsUniqueKey || $updatableView; if (!empty($table) && (PMA_is_system_schema($db) || !$editable)) {