From 7d853ce0edaa32b1cce55ec57d594a5398c2fd1c Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 8 Aug 2015 21:22:35 +0200 Subject: [PATCH 01/10] Translated using Weblate (Turkish) Currently translated at 100.0% (3040 of 3040 strings) [CI skip] --- po/tr.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/tr.po b/po/tr.po index 13d1c668ce..346f9f08be 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2,12 +2,12 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-07-08 21:47+0200\n" +"PO-Revision-Date: 2015-08-08 21:22+0200\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" @@ -13387,10 +13387,10 @@ msgid "Run SQL query/queries on database %s" msgstr "%s veritabanı üzerinde SQL sorgusunu/sorgularını çalıştır" #: libraries/sql_query_form.lib.php:192 -#, fuzzy, php-format +#, php-format #| msgid "Run SQL query/queries on database %s" msgid "Run SQL query/queries on table %s" -msgstr "%s veritabanı üzerinde SQL sorgusunu/sorgularını çalıştır" +msgstr "%s tablosu üzerinde SQL sorgusunu/sorgularını çalıştır" #: libraries/sql_query_form.lib.php:241 msgid "Get auto-saved query" @@ -14584,10 +14584,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Satır: %1$s, Sütun: %2$s, Hata: %3$s" #: tbl_row_action.php:65 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Seçilen sürümler yok." +msgstr "Seçilen satır yok." #: tbl_structure.php:63 #, php-format From cfd828c5cd6358448e5078abc4b3c57226ede09e Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 9 Aug 2015 02:11:01 +0200 Subject: [PATCH 02/10] Translated using Weblate (Slovenian) Currently translated at 100.0% (3040 of 3040 strings) [CI skip] --- po/sl.po | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/po/sl.po b/po/sl.po index dc007106f1..e9df65fb8f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2,18 +2,18 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-07-08 20:32+0200\n" +"PO-Revision-Date: 2015-08-09 02:11+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 2.4-dev\n" #: changelog.php:36 license.php:28 @@ -13373,10 +13373,10 @@ msgid "Run SQL query/queries on database %s" msgstr "Izvedi poizvedbo/poizvedbe SQL na zbirki podatkov %s" #: libraries/sql_query_form.lib.php:192 -#, fuzzy, php-format +#, php-format #| msgid "Run SQL query/queries on database %s" msgid "Run SQL query/queries on table %s" -msgstr "Izvedi poizvedbo/poizvedbe SQL na zbirki podatkov %s" +msgstr "Izvedi poizvedbo/poizvedbe SQL na tabeli %s" #: libraries/sql_query_form.lib.php:241 msgid "Get auto-saved query" @@ -14560,10 +14560,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Vrstica: %1$s, Stolpec: %2$s, Napaka: %3$s" #: tbl_row_action.php:65 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Ni izbranih različic." +msgstr "Ni izbranih vrstic." #: tbl_structure.php:63 #, php-format From a3af754db0d0e057835814872591608fa1a59206 Mon Sep 17 00:00:00 2001 From: Hauke Henningsen Date: Mon, 10 Aug 2015 00:17:24 +0200 Subject: [PATCH 03/10] Translated using Weblate (German) Currently translated at 100.0% (3040 of 3040 strings) [CI skip] --- po/de.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index 19deb4dd6e..caafdcb833 100644 --- a/po/de.po +++ b/po/de.po @@ -2,12 +2,12 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-07-20 05:06+0200\n" +"PO-Revision-Date: 2015-08-10 00:17+0200\n" "Last-Translator: Hauke Henningsen \n" -"Language-Team: German \n" +"Language-Team: German " +"\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13581,10 +13581,10 @@ msgid "Run SQL query/queries on database %s" msgstr "SQL-Befehl(e) in Datenbank %s ausführen" #: libraries/sql_query_form.lib.php:192 -#, fuzzy, php-format +#, php-format #| msgid "Run SQL query/queries on database %s" msgid "Run SQL query/queries on table %s" -msgstr "SQL-Befehl(e) in Datenbank %s ausführen" +msgstr "SQL-Befehl(e) in Tabelle %s ausführen" #: libraries/sql_query_form.lib.php:241 msgid "Get auto-saved query" @@ -14780,10 +14780,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Zeile: %1$s, Spalte: %2$s, Fehler: %3$s" #: tbl_row_action.php:65 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Keine Versionen ausgewählt." +msgstr "Keine Zeilen ausgewählt." #: tbl_structure.php:63 #, php-format From 47d297dc66519c85045538bf7283a3762a8b8612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Mon, 10 Aug 2015 11:04:25 +0200 Subject: [PATCH 04/10] Translated using Weblate (Estonian) Currently translated at 100.0% (3040 of 3040 strings) [CI skip] --- po/et.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/et.po b/po/et.po index bc3f11fd48..09a3e0ea5d 100644 --- a/po/et.po +++ b/po/et.po @@ -4,12 +4,12 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-07-30 15:21+0200\n" +"PO-Revision-Date: 2015-08-10 11:04+0200\n" "Last-Translator: Kristjan Räts \n" -"Language-Team: Estonian \n" +"Language-Team: Estonian " +"\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13270,10 +13270,10 @@ msgid "Run SQL query/queries on database %s" msgstr "Teosta SQL päring(ud) %s andmebaasis" #: libraries/sql_query_form.lib.php:192 -#, fuzzy, php-format +#, php-format #| msgid "Run SQL query/queries on database %s" msgid "Run SQL query/queries on table %s" -msgstr "Teosta SQL päring(ud) %s andmebaasis" +msgstr "Teosta SQL päring(ud) tabelis %s" #: libraries/sql_query_form.lib.php:241 msgid "Get auto-saved query" @@ -14454,10 +14454,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Rida: %1$s, veerg: %2$s, viga: %3$s" #: tbl_row_action.php:65 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Versioone ei ole valitud." +msgstr "Mitte ühtegi rida ei valitud." #: tbl_structure.php:63 #, php-format From fff8ccd5b9b1183c420d2a8eae658400fb4a8011 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: Mon, 10 Aug 2015 12:06:11 +0200 Subject: [PATCH 05/10] Translated using Weblate (Greek) Currently translated at 100.0% (3040 of 3040 strings) [CI skip] --- po/el.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/el.po b/po/el.po index 68e8706545..b1e48d91ed 100644 --- a/po/el.po +++ b/po/el.po @@ -2,12 +2,12 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-07-21 07:27+0200\n" +"PO-Revision-Date: 2015-08-10 12:06+0200\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" @@ -13546,10 +13546,10 @@ msgid "Run SQL query/queries on database %s" msgstr "Εκτέλεση εντολής/εντολών SQL στη βάση δεδομένων %s" #: libraries/sql_query_form.lib.php:192 -#, fuzzy, php-format +#, php-format #| msgid "Run SQL query/queries on database %s" msgid "Run SQL query/queries on table %s" -msgstr "Εκτέλεση εντολής/εντολών SQL στη βάση δεδομένων %s" +msgstr "Εκτέλεση ερωτήματος/ερωτημάτων SQL στον πίνακα %s" #: libraries/sql_query_form.lib.php:241 msgid "Get auto-saved query" @@ -14744,10 +14744,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Γραμμή: %1$s, Στήλη: %2$s, Σφάλμα: %3$s" #: tbl_row_action.php:65 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Δεν επιλέχθηκαν εκδόσεις." +msgstr "Δεν επιλέχθηκε εγγραφή." #: tbl_structure.php:63 #, php-format From 6e7c0a1cb401db3311f18e4224e04ba7ae070918 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 10 Aug 2015 13:03:37 +0200 Subject: [PATCH 06/10] Translated using Weblate (French) Currently translated at 100.0% (3040 of 3040 strings) [CI skip] --- po/fr.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/fr.po b/po/fr.po index 1d7dd5e6f0..85dcc7a8fa 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,12 +2,12 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-08-02 12:45+0200\n" +"PO-Revision-Date: 2015-08-10 13:03+0200\n" "Last-Translator: Marc Delisle \n" -"Language-Team: French \n" +"Language-Team: French " +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13509,10 +13509,10 @@ msgid "Run SQL query/queries on database %s" msgstr "Exécuter une ou des requêtes SQL sur la base %s" #: libraries/sql_query_form.lib.php:192 -#, fuzzy, php-format +#, php-format #| msgid "Run SQL query/queries on database %s" msgid "Run SQL query/queries on table %s" -msgstr "Exécuter une ou des requêtes SQL sur la base %s" +msgstr "Exécuter une ou des requêtes SQL sur la table %s" #: libraries/sql_query_form.lib.php:241 msgid "Get auto-saved query" @@ -14703,10 +14703,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Ligne : %1$s, Colonne : %2$s, Erreur : %3$s" #: tbl_row_action.php:65 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Aucune version n'a été sélectionnée." +msgstr "Aucune ligne n'a été sélectionnée." #: tbl_structure.php:63 #, php-format From 630bf5db8a3199539bbdba371e19a7a2a4d01bb5 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Sun, 9 Aug 2015 00:05:46 +0200 Subject: [PATCH 07/10] Translated using Weblate (Interlingua) Currently translated at 69.6% (2116 of 3040 strings) [CI skip] --- po/ia.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/ia.po b/po/ia.po index 37b51d1ef4..13e589ba6d 100644 --- a/po/ia.po +++ b/po/ia.po @@ -6,12 +6,12 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-07-19 22:28+0200\n" +"PO-Revision-Date: 2015-08-09 00:05+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" @@ -13182,10 +13182,10 @@ msgid "Run SQL query/queries on database %s" msgstr "" #: libraries/sql_query_form.lib.php:192 -#, fuzzy, php-format +#, php-format #| msgid "SQL query history table" msgid "Run SQL query/queries on table %s" -msgstr "Tabella de chronologia de query de SQL" +msgstr "Executa query/queries de SQL sur tabella %s" #: libraries/sql_query_form.lib.php:241 msgid "Get auto-saved query" @@ -14319,10 +14319,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "" #: tbl_row_action.php:65 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Necun versiones seligite." +msgstr "Necun rango seligite." #: tbl_structure.php:63 #, php-format From 4b3596469928ea5eb4c92d62ebf27d6482c13841 Mon Sep 17 00:00:00 2001 From: Stefano Martinelli Date: Sat, 8 Aug 2015 22:17:44 +0200 Subject: [PATCH 08/10] Translated using Weblate (Italian) Currently translated at 100.0% (3040 of 3040 strings) [CI skip] --- po/it.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/it.po b/po/it.po index 2c5fb4b6d0..b3923fbecd 100644 --- a/po/it.po +++ b/po/it.po @@ -2,12 +2,12 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-08-03 17:18+0200\n" +"PO-Revision-Date: 2015-08-08 22:17+0200\n" "Last-Translator: Stefano Martinelli \n" -"Language-Team: Italian \n" +"Language-Team: Italian " +"\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13535,10 +13535,10 @@ msgid "Run SQL query/queries on database %s" msgstr "Esegui la/e query SQL sul database %s" #: libraries/sql_query_form.lib.php:192 -#, fuzzy, php-format +#, php-format #| msgid "Run SQL query/queries on database %s" msgid "Run SQL query/queries on table %s" -msgstr "Esegui la/e query SQL sul database %s" +msgstr "Esegui la/le query SQL sulla tabella %s" #: libraries/sql_query_form.lib.php:241 msgid "Get auto-saved query" @@ -14732,10 +14732,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Riga: %1$s, Campo: %2$s, Errore: %3$s" #: tbl_row_action.php:65 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Nessuna versione selezionata." +msgstr "Nessuna riga selezionata." #: tbl_structure.php:63 #, php-format From 5924811985832fb1741f89add5454a5045305e4f Mon Sep 17 00:00:00 2001 From: dingo thirteen Date: Mon, 10 Aug 2015 14:38:35 +0200 Subject: [PATCH 09/10] Translated using Weblate (Dutch) Currently translated at 100.0% (3040 of 3040 strings) [CI skip] --- po/nl.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/nl.po b/po/nl.po index 6b1dba8855..ff5e93332e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,12 +2,12 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-08-02 14:50+0200\n" +"PO-Revision-Date: 2015-08-10 14:38+0200\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" @@ -13512,10 +13512,10 @@ msgid "Run SQL query/queries on database %s" msgstr "Voer SQL-query/query's uit op database %s" #: libraries/sql_query_form.lib.php:192 -#, fuzzy, php-format +#, php-format #| msgid "Run SQL query/queries on database %s" msgid "Run SQL query/queries on table %s" -msgstr "Voer SQL-query/query's uit op database %s" +msgstr "Voer SQL query/query's uit op tabel %s" #: libraries/sql_query_form.lib.php:241 msgid "Get auto-saved query" @@ -14716,10 +14716,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Rij: %1$s, Kolom: %2$s, Fout: %3$s" #: tbl_row_action.php:65 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "Geen versies geselecteerd." +msgstr "Geen rij geselecteerd." #: tbl_structure.php:63 #, php-format From c0803823f2b8845f70936f741085dc9e26a547ba Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 10 Aug 2015 08:41:07 -0400 Subject: [PATCH 10/10] Fixes #11380 Incomplete message after import Signed-off-by: Marc Delisle --- ChangeLog | 1 + import.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5bb66380d9..853b07b9df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.4.14.0 (not yet released) - issue #11367 Export after search, missing WHERE clause +- issue #11380 Incomplete message after import 4.4.13.1 (2015-08-08) - issue #11368 SQL error when importing phpMyAdmin dump file diff --git a/import.php b/import.php index f95e763a0e..c551179078 100644 --- a/import.php +++ b/import.php @@ -644,7 +644,7 @@ if (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 2) { if ($import_notice) { $message->addString($import_notice); } - if (isset($local_import_file)) { + if (! empty($local_import_file)) { $message->addString('(' . htmlspecialchars($local_import_file) . ')'); } else { $message->addString(