From a3c4cf7c74b902bd332cdae92e58df473d7d2243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=A4ster?= Date: Mon, 6 May 2013 11:06:02 +0200 Subject: [PATCH 1/9] Translated using Weblate (German) Currently translated at 100.0% (2606 of 2607) --- po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index c7dc43b1e6..b351890861 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: 2013-05-02 13:12+0200\n" -"PO-Revision-Date: 2013-04-26 09:30+0200\n" -"Last-Translator: J. M. \n" +"PO-Revision-Date: 2013-05-06 11:06+0200\n" +"Last-Translator: David Däster \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -7780,7 +7780,7 @@ msgstr "" #: libraries/plugins/auth/AuthenticationConfig.class.php:142 msgid "Retry to connect" -msgstr "" +msgstr "Versuche einen neuen Verbindungsaufbau" #: libraries/plugins/auth/AuthenticationCookie.class.php:44 msgid "Failed to use Blowfish from mcrypt!" From 54939fedba0cb105204aff1269bccdc6c93d4f95 Mon Sep 17 00:00:00 2001 From: Anusuk Sangubon Date: Mon, 6 May 2013 11:03:10 +0200 Subject: [PATCH 2/9] Translated using Weblate (Thai) Currently translated at 34.9% (909 of 2607) --- po/th.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/th.po b/po/th.po index 278e9a2cb7..d6719d2b51 100644 --- a/po/th.po +++ b/po/th.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-02 13:12+0200\n" -"PO-Revision-Date: 2012-11-12 11:31+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Thai \n" +"PO-Revision-Date: 2013-05-06 11:03+0200\n" +"Last-Translator: Anusuk Sangubon \n" +"Language-Team: Thai \n" "Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 1.3-dev\n" +"X-Generator: Weblate 1.6-dev\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:344 #: libraries/DisplayResults.class.php:809 @@ -722,7 +722,6 @@ msgid "Server" msgstr "เซิร์ฟเวอร์" #: index.php:240 -#, fuzzy msgid "Server type" msgstr "ตัวเลือกเซิร์ฟเวอร์" @@ -764,9 +763,8 @@ msgid "Show PHP information" msgstr "แสดงข้อมูลของ PHP" #: index.php:323 libraries/engines/bdb.lib.php:25 -#, fuzzy msgid "Version information" -msgstr "ข้อมูลล็อกอิน" +msgstr "ข้อมูลเวอร์ชัน" #: index.php:332 libraries/Util.class.php:430 libraries/Util.class.php:516 #: libraries/config/FormDisplay.tpl.php:145 From 1f200795aa9a9935aa5d6f72422fa8a1cd4f5932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 7 May 2013 15:21:24 +0200 Subject: [PATCH 3/9] Translated using Weblate (Spanish) Currently translated at 100.0% (2607 of 2607) --- po/es.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/es.po b/po/es.po index cd06b0c85e..b5172c9f7e 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-02 13:12+0200\n" -"PO-Revision-Date: 2013-05-03 16:34+0200\n" +"PO-Revision-Date: 2013-05-07 15:21+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: Spanish \n" "Language: es\n" @@ -12322,7 +12322,7 @@ msgstr "Etiqueta del eje Y:" #: tbl_create.php:32 #, php-format msgid "Table %s already exists!" -msgstr "La tabla %s ya existe." +msgstr "La tabla %s ya existe!" #: tbl_create.php:56 tbl_get_field.php:37 #, php-format @@ -12364,15 +12364,15 @@ msgstr "Nombre del archivo" #: tbl_indexes.php:71 msgid "The name of the primary key must be \"PRIMARY\"!" -msgstr "El nombre de la clave primaria debe ser «PRIMARY»." +msgstr "El nombre de la clave primaria debe ser «PRIMARY»!" #: tbl_indexes.php:81 msgid "Can't rename index to PRIMARY!" -msgstr "No se puede cambiar el nombre del índice a PRIMARY." +msgstr "No se puede cambiar el nombre del índice a PRIMARY!" #: tbl_indexes.php:97 msgid "No index parts defined!" -msgstr "No se han definido las partes del índice." +msgstr "No se han definido las partes del índice!" #: tbl_indexes.php:197 msgid "Edit index" From ac2f98095c031959ccbdf5afe6f44564fac564c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20AVILA?= Date: Tue, 7 May 2013 22:57:06 +0200 Subject: [PATCH 4/9] Translated using Weblate (French) Currently translated at 100.0% (2607 of 2607) --- po/fr.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 35b424b4dd..2ea7b2ad6d 100644 --- a/po/fr.po +++ b/po/fr.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: 2013-05-02 13:12+0200\n" -"PO-Revision-Date: 2013-04-25 22:16+0200\n" -"Last-Translator: Marc Delisle \n" +"PO-Revision-Date: 2013-05-07 22:57+0200\n" +"Last-Translator: Jean-Noël AVILA \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -7765,7 +7765,7 @@ msgstr "" #: libraries/plugins/auth/AuthenticationConfig.class.php:142 msgid "Retry to connect" -msgstr "" +msgstr "Réessayer de se connecter" #: libraries/plugins/auth/AuthenticationCookie.class.php:44 msgid "Failed to use Blowfish from mcrypt!" @@ -12357,10 +12357,9 @@ msgid "No index defined! Create one below" msgstr "Aucun index n'est défini ! Créez-en un dans le dialogue plus bas" #: tbl_structure.php:125 -#, fuzzy #| msgid "No rows selected" msgid "No column selected." -msgstr "Aucune ligne n'a été sélectionnée" +msgstr "Aucune colonne n'a été sélectionnée" #: tbl_structure.php:149 #, php-format From 6245756244111622ab2ca2aaa9f4bf4de12b0c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 7 May 2013 15:03:35 +0200 Subject: [PATCH 5/9] Translated using Weblate (Korean) Currently translated at 63.0% (1641 of 2605) --- po/ko.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index ea729c0797..52683caccd 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-05-02 13:12+0200\n" -"PO-Revision-Date: 2013-05-05 08:54+0200\n" -"Last-Translator: Seunggyun Hong \n" +"PO-Revision-Date: 2013-05-07 15:03+0200\n" +"Last-Translator: Michal Čihař \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -1821,7 +1821,7 @@ msgstr "" #: js/messages.php:333 msgid "Add an option for column " -msgstr "필드 옵션 추가" +msgstr "필드 옵션 추가 " #: js/messages.php:334 #, php-format From 64cb3de415fccfcde5e4915d4ce5a9a0183c4e6d Mon Sep 17 00:00:00 2001 From: Jan Brejcha Date: Fri, 3 May 2013 01:34:38 +0200 Subject: [PATCH 6/9] - Updated variable goto - set to empty string when the table is empty (line 330) - When the result is empty, we want to show only message, that the result was empty. So when $goto is set to empty (see above) I will echo one space and exit. In other cases just show the set goto as before this change. (lines 995 to 1002) --- sql.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sql.php b/sql.php index f670b658a5..b40fcf5276 100644 --- a/sql.php +++ b/sql.php @@ -327,7 +327,7 @@ if (empty($sql_query) && strlen($table) && strlen($db)) { unset($book_sql_query); // set $goto to what will be displayed if query returns 0 rows - $goto = 'tbl_structure.php'; + $goto = ''; } else { // Now we can check the parameters PMA_Util::checkParameters(array('sql_query')); @@ -992,8 +992,14 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { $goto = 'index.php'; } // Loads to target script - $active_page = $goto; - include '' . $goto; + if (strlen($goto) > 0){ + $active_page = $goto; + include '' . $goto; + } + else{ + echo " "; + } + } else { // avoid a redirect loop when last record was deleted if (0 == $num_rows && 'sql.php' == $cfg['DefaultTabTable']) { From 1bcb4a281bc7e48401cb9eed2eb135e2985bfced Mon Sep 17 00:00:00 2001 From: Jan Brejcha Date: Fri, 3 May 2013 08:13:46 +0200 Subject: [PATCH 7/9] Changed coding style to the project coding style. --- sql.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql.php b/sql.php index b40fcf5276..f8e44932d7 100644 --- a/sql.php +++ b/sql.php @@ -995,8 +995,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { if (strlen($goto) > 0){ $active_page = $goto; include '' . $goto; - } - else{ + } else { echo " "; } From 60db2bdb9c4a4163d4d2978a83cab785c2feb8a4 Mon Sep 17 00:00:00 2001 From: Jan Brejcha Date: Sun, 5 May 2013 23:31:39 +0200 Subject: [PATCH 8/9] Added spacing before "{". --- sql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql.php b/sql.php index f8e44932d7..2916a0675d 100644 --- a/sql.php +++ b/sql.php @@ -992,7 +992,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { $goto = 'index.php'; } // Loads to target script - if (strlen($goto) > 0){ + if (strlen($goto) > 0) { $active_page = $goto; include '' . $goto; } else { From 0f766fc5f5a77618172fcc28eecab24bb044b5e7 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 8 May 2013 09:46:46 -0400 Subject: [PATCH 9/9] Fix merge conflicts --- ChangeLog | 1 + sql.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 026f1392e9..fc0b9c1c1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog - bug #3895 [browse] Fixed getting BLOB data - bug #3905 [export] Custom Exporting exports all databases - bug #3909 [import] Import of CSV FIle to selected table doesn't work +- bug #3904 Browsing an empty table should not display its Structure 4.0.0.0 (2013-05-03) + Patch #3481047 for rfe #3480477 Insert as new row enhancement diff --git a/sql.php b/sql.php index 2916a0675d..0fdde041a4 100644 --- a/sql.php +++ b/sql.php @@ -993,10 +993,11 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) { } // Loads to target script if (strlen($goto) > 0) { - $active_page = $goto; - include '' . $goto; + $active_page = $goto; + include '' . $goto; } else { - echo " "; + // Echo at least one character to prevent showing last page from history + echo " "; } } else {