From b215875e3ea6fc76c22c5e26fb147e0d5d36c8ad Mon Sep 17 00:00:00 2001
From: Aputsiaq Niels Janussen <aj@isit.gl>
Date: Wed, 26 Nov 2014 21:53:53 +0100
Subject: [PATCH 01/30] Translated using Weblate (Danish)

Currently translated at 97.2% (2896 of 2978 strings)

[CI skip]
---
 po/da.po | 56 ++++++++++++++++++++++++++------------------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/po/da.po b/po/da.po
index a74d0d903f..4f81f5e724 100644
--- a/po/da.po
+++ b/po/da.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-10-29 16:06+0200\n"
+"PO-Revision-Date: 2014-11-26 21:53+0200\n"
 "Last-Translator: Aputsiaq Niels Janussen <aj@isit.gl>\n"
-"Language-Team: Danish <https://hosted.weblate.org/projects/phpmyadmin/master/"
-"da/>\n"
+"Language-Team: Danish "
+"<https://hosted.weblate.org/projects/phpmyadmin/4-3/da/>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\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
@@ -32,10 +32,10 @@ msgid "Click to sort."
 msgstr "Klik for at sortere."
 
 #: 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 "Viser række(rne) %1$s - %2$s"
+msgstr "Viser rækkerne %1$s - %2$s."
 
 #: db_create.php:61
 #, php-format
@@ -896,15 +896,14 @@ msgstr ""
 "udvidede funktioner er blevet deaktiverede. %sFind ud af hvorfor%s. "
 
 #: index.php:527
-#, fuzzy
 #| msgid ""
 #| "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Or alternately go to 'Operations' "
 #| "tab of any database to set it up there."
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gå eventuelt til fanen 'Handlinger' "
-"tilhørende enhver database for at opsætte den dér."
+"Gå eventuelt til fanen 'Handlinger' tilhørende enhver database for at "
+"opsætte den dér."
 
 #: index.php:572
 #, php-format
@@ -1889,70 +1888,68 @@ msgid ""
 "Note: a, b -> d,f implies values of columns a and b combined together can "
 "determine values of column d and column f."
 msgstr ""
+"Bemærk: a, b -> d,f implicerer, at værdier med kolonnerne a og b kombineret "
+"sammen kan afgøre værdier for kolonne d og kolonne f."
 
 #: js/messages.php:323
-#, fuzzy
 #| msgid "No databases selected."
 msgid "No partial dependencies selected!"
-msgstr "Ingen databaser valgt."
+msgstr "Der blev ikke valgt delvise afhængigheder!"
 
 #: js/messages.php:325
 msgid "Show me the possible partial dependencies based on data in the table"
-msgstr ""
+msgstr "Vis mig de mulige, delvise afhængigheder baseret på data i tabellen"
 
 #: js/messages.php:326
 msgid "Hide partial dependencies list"
-msgstr ""
+msgstr "Skjul listen med delvise afhængigheder"
 
 #: js/messages.php:327
 msgid ""
 "Sit tight! It may take few seconds depending on data size and column count "
 "of the table."
 msgstr ""
+"Hold vejret! Der kan gå nogle sekunder afhængig af datastørrelsen og "
+"antallet af kolonner i tabellen."
 
 #: js/messages.php:328
-#, fuzzy
 #| msgid "Step 1."
 msgid "Step"
-msgstr "Trin 1."
+msgstr "Trin"
 
 #: js/messages.php:329
-#, fuzzy
 #| msgid "The following queries have been executed:"
 msgid "The following actions will be performed:"
-msgstr "De følgende forespørgsler er blevet udført:"
+msgstr "De følgende handlinger vil blive udført:"
 
 #: js/messages.php:330
-#, fuzzy, php-format
+#, php-format
 #| msgid "Remove columns from central list"
 msgid "DROP columns %s from the table %s"
-msgstr "Fjern kolonner fra centerliste"
+msgstr "DROP kolonnerne %s fra tabellen %s"
 
 #: js/messages.php:331
-#, fuzzy
 #| msgid "Add privileges on the following table:"
 msgid "Create the following table"
-msgstr "Tilføj privileges på følgende tabel:"
+msgstr "Opret følgende tabel"
 
 #: js/messages.php:334
-#, fuzzy
 #| msgid "Third step of normalization (1NF+2NF+3NF)"
 msgid "Third step of normalization (3NF)"
-msgstr "Tredje trin af normaliseringen (1NF+2NF+3NF)"
+msgstr "Tredje trin af normaliseringen (3NF)"
 
 #: js/messages.php:335
 msgid "Confirm transitive dependencies"
-msgstr ""
+msgstr "Bekræft transitive afhængigheder"
 
 #: js/messages.php:336
 msgid "Selected dependencies are as follows:"
-msgstr ""
+msgstr "De valgte afhængigheder er som følger:"
 
 #: js/messages.php:337
-#, fuzzy
 #| msgid "No databases selected."
 msgid "No dependencies selected!"
-msgstr "Ingen databaser valgt."
+msgstr "Der er ikke valgt afhængigheder!"
 
 #: js/messages.php:340 libraries/insert_edit.lib.php:1452
 #: libraries/server_variables.lib.php:157
@@ -2124,10 +2121,9 @@ msgid "Delete page"
 msgstr "Slet side"
 
 #: js/messages.php:407 libraries/db_designer.lib.php:382
-#, fuzzy
 #| msgid "*Untitled"
 msgid "Untitled"
-msgstr "*Unavngivet"
+msgstr "Unavngivet"
 
 #: js/messages.php:408
 msgid "Please select a page to continue"

From 6aaf98273ba251e48156969a73915a337529819d Mon Sep 17 00:00:00 2001
From: Giovanni Sora <g.sora@tiscali.it>
Date: Wed, 26 Nov 2014 19:13:54 +0100
Subject: [PATCH 02/30] Translated using Weblate (Interlingua)

Currently translated at 63.7% (1898 of 2978 strings)

[CI skip]
---
 po/ia.po | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/po/ia.po b/po/ia.po
index b497093781..5a6d7cfda0 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -8,7 +8,7 @@ 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-15 11:05+0200\n"
+"PO-Revision-Date: 2014-11-26 19:13+0200\n"
 "Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-3/ia/>\n"
@@ -911,6 +911,8 @@ msgstr ""
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
+"O alternativemente  va a le scheda de 'Operationes' de ulle base de datos "
+"pro configurar lo illac."
 
 #: index.php:572
 #, php-format

From c9cbfec6ca083d1d3af9148cc768673831a6b700 Mon Sep 17 00:00:00 2001
From: Marcos Algeri <malgeri@gmail.com>
Date: Wed, 26 Nov 2014 18:35:51 +0100
Subject: [PATCH 03/30] Translated using Weblate (Portuguese (Brazil))

Currently translated at 94.0% (2801 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 ea534dd86f..792f09faa2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,8 +4,8 @@ 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-26 18:30+0200\n"
-"Last-Translator: Danilo GUia <danilo.eng@globomail.com>\n"
+"PO-Revision-Date: 2014-11-26 18:35+0200\n"
+"Last-Translator: Marcos Algeri <malgeri@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-3/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -2241,6 +2241,8 @@ msgid ""
 "Do you really want to see all of the rows? For a big table this could crash "
 "the browser."
 msgstr ""
+"Você realmente quer ver todas as linhas? Para uma tabela grande isto poderia "
+"travar o nevegador."
 
 #: js/messages.php:436
 #, fuzzy
@@ -2269,10 +2271,9 @@ msgid "Drop files here"
 msgstr "Limite de arquivo de log"
 
 #: js/messages.php:442
-#, fuzzy
 #| msgid "Select Tables"
 msgid "Select database first"
-msgstr "Selecionar tabelas"
+msgstr "Primeiro escolha um banco de dados"
 
 #: js/messages.php:447
 msgid "You can also edit most values<br />by double-clicking directly on them."
@@ -2434,10 +2435,9 @@ msgstr ""
 "favor, seja paciente."
 
 #: js/messages.php:527
-#, fuzzy
 #| msgid "Show this query here again"
 msgid "Execute this query again?"
-msgstr "Mostrar esta consulta SQL aqui novamente"
+msgstr "Executar esta consulta novamente?"
 
 #: js/messages.php:528
 #, fuzzy
@@ -2788,7 +2788,7 @@ msgstr "Expandir/Recolher"
 
 #: libraries/Console.class.php:94 libraries/Console.class.php:177
 msgid "Expand"
-msgstr ""
+msgstr "Expandir"
 
 #: libraries/Console.class.php:95 libraries/Console.class.php:178
 #, fuzzy

From 3d87430aa00aa3956d7308ac1cdcda0a42fa0072 Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 14:43:16 +0100
Subject: [PATCH 04/30] [FIX] Browse table: Make Show all label clickable

<label for> works with IDs, not names.

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
---
 libraries/DisplayResults.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 49aa2fd6bb..fb3b9148a0 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -861,7 +861,7 @@ class PMA_DisplayResults
             . (! $showing_all ? 'all' : $GLOBALS['cfg']['MaxRows']) . '" />'
             . '<input type="hidden" name="goto" value="' . $this->__get('goto')
             . '" />'
-            . '<input type="checkbox" name="navig" class="showAllRows"'
+            . '<input type="checkbox" name="navig" id="navig" class="showAllRows"'
             . (! $showing_all ? '' : ' checked="checked"') . ' value="all" />'
             . '<label for="navig">' . __('Show all') . '</label>'
             . '</form>'

From a47128ca4fccd6d3438bb12dea176af34af4e5b2 Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 14:52:34 +0100
Subject: [PATCH 05/30] [FIX] JS error reporting: Preserve hash fragment

The JS error reporting notification bar closing link points to href="#".
Don't allow navigating to the target, so our hash history is not
overwritten.

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
---
 js/error_report.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/error_report.js b/js/error_report.js
index 3d00b39466..248397427e 100644
--- a/js/error_report.js
+++ b/js/error_report.js
@@ -151,7 +151,9 @@ var ErrorReport = {
      *
      * @return void
      */
-    _removeErrorNotification: function () {
+    _removeErrorNotification: function (e) {
+        // don't remove the hash fragment by navigating to #
+        e.preventDefault();
         $("#error_notification").fadeOut(function () {
             $(this).remove();
         });

From 0ab3ee372844c3d3b445daa323dff35199611346 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 27 Nov 2014 09:32:24 -0500
Subject: [PATCH 06/30] 4.3.0-rc1

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 README                     | 2 +-
 doc/conf.py                | 2 +-
 libraries/Config.class.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index e04cdce193..adac8f27c4 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.3.0-beta1
+Version 4.3.0-rc1
 
 A set of PHP-scripts to manage MySQL over the web.
 
diff --git a/doc/conf.py b/doc/conf.py
index a86e28cd25..1633996160 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.3.0-beta1'
+version = '4.3.0-rc1'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 252f50f936..98f0ba13a3 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -114,7 +114,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.3.0-beta1');
+        $this->set('PMA_VERSION', '4.3.0-rc1');
         /**
          * @deprecated
          */

From f99176f5ff9589e1e6bc991de823189b5367d5ba Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Thu, 27 Nov 2014 15:39:42 +0100
Subject: [PATCH 07/30] Translated using Weblate (Dutch)

Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
---
 po/nl.po | 54 +++++++++++++++++++++++-------------------------------
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 954249c19b..09bcc2c76b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-11-26 08:29-0500\n"
-"PO-Revision-Date: 2014-11-14 13:42+0200\n"
+"PO-Revision-Date: 2014-11-27 15:39+0200\n"
 "Last-Translator: Dieter Adriaenssens <ruleant@users.sourceforge.net>\n"
-"Language-Team: Dutch <https://hosted.weblate.org/projects/phpmyadmin/master/"
-"nl/>\n"
+"Language-Team: Dutch "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/nl/>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\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
@@ -328,23 +328,23 @@ msgid "Access denied!"
 msgstr "Toegang geweigerd!"
 
 #: db_tracking.php:38 db_tracking.php:63
-#, fuzzy
 #| msgid "Tracking data definition successfully deleted"
 msgid "Tracking data deleted successfully."
-msgstr "Tracking-gegevensdefinitie succesvol verwijderd"
+msgstr "Tracking-gegevens succesvol verwijderd."
 
 #: db_tracking.php:47
-#, fuzzy, php-format
+#, php-format
 #| msgid "Version %1$s was created, tracking for %2$s is active."
 msgid ""
 "Version %1$s was created for selected tables, tracking is active for them."
-msgstr "Versie %1$s is aangemaakt, tracking van %2$s is ingeschakeld."
+msgstr ""
+"Versie %1$s is aangemaakt voor de geselecteerde tabellen, waarvoor tracking "
+"is ingeschakeld."
 
 #: db_tracking.php:78
-#, fuzzy
 #| msgid "No databases selected."
 msgid "No tables selected."
-msgstr "Er zijn geen databanken geselecteerd."
+msgstr "Er zijn geen tabellen geselecteerd."
 
 #: db_tracking.php:112
 msgid "Tracked tables"
@@ -391,10 +391,9 @@ msgid "Delete tracking data for this table"
 msgstr "Verwijder tracking data voor deze tabel"
 
 #: db_tracking.php:145 db_tracking.php:207
-#, fuzzy
 #| msgid "Deleting tracking data"
 msgid "Delete tracking"
-msgstr "Tracking data voor deze tabel wordt verwijderd"
+msgstr "Verwijder tracking"
 
 #: db_tracking.php:183
 msgid "Versions"
@@ -949,28 +948,24 @@ msgid "You are about to TRUNCATE a complete table!"
 msgstr "U staat op het punt een volledige databank LEEG te maken!"
 
 #: js/messages.php:40
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data for this table?"
-msgstr "Verwijder tracking data voor deze tabel"
+msgstr "Verwijder tracking data voor deze tabel?"
 
 #: js/messages.php:41
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data for these tables?"
-msgstr "Verwijder tracking data voor deze tabel"
+msgstr "Verwijder tracking data voor deze tabellen?"
 
 #: js/messages.php:42
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data for this version?"
-msgstr "Verwijder tracking data voor deze tabel"
+msgstr "Verwijder tracking data voor deze versie?"
 
 #: js/messages.php:43
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data for these versions?"
-msgstr "Verwijder tracking data voor deze tabel"
+msgstr "Verwijder tracking data voor deze versies?"
 
 #: js/messages.php:44
 msgid "Deleting tracking data"
@@ -13954,10 +13949,10 @@ msgid "Create version %1$s of %2$s"
 msgstr "Versie %1$s van %2$s aanmaken"
 
 #: libraries/tracking.lib.php:73
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create version"
 msgid "Create version %1$s"
-msgstr "Versie aanmaken"
+msgstr "Versie %1$s aanmaken"
 
 #: libraries/tracking.lib.php:78
 msgid "Track these data definition statements:"
@@ -13990,10 +13985,9 @@ msgid "Deactivate now"
 msgstr "Nu uitschakelen"
 
 #: libraries/tracking.lib.php:258 libraries/tracking.lib.php:312
-#, fuzzy
 #| msgid "Create version"
 msgid "Delete version"
-msgstr "Versie aanmaken"
+msgstr "Versie verwijderen"
 
 #: libraries/tracking.lib.php:377 libraries/tracking.lib.php:1386
 msgid "active"
@@ -14109,10 +14103,10 @@ msgid "Tracking for %1$s was deactivated at version %2$s."
 msgstr "Tracking van %1$s is uitgeschakeld op versie %2$s."
 
 #: libraries/tracking.lib.php:1258
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create version %1$s of %2$s"
 msgid "Version %1$s of %2$s was deleted."
-msgstr "Versie %1$s van %2$s aanmaken"
+msgstr "Versie %1$s van %2$s werd verwijderd."
 
 #: libraries/tracking.lib.php:1289
 #, php-format
@@ -14479,16 +14473,14 @@ msgid "Tracking of %s is activated."
 msgstr "Tracking van %s is ingeschakeld."
 
 #: tbl_tracking.php:100
-#, fuzzy
 #| msgid "The selected users have been deleted successfully."
 msgid "Tracking versions deleted successfully."
-msgstr "De geselecteerde gebruikers zijn met succes verwijderd."
+msgstr "Tracking versies zijn met succes verwijderd."
 
 #: tbl_tracking.php:105
-#, fuzzy
 #| msgid "No rows selected"
 msgid "No versions selected."
-msgstr "Geen rijen geselecteerd"
+msgstr "Geen versies geselecteerd."
 
 #: tbl_tracking.php:132
 msgid "SQL statements executed."

From aeebf1052f6d627ff5d2c2833aec8ab427cee9ef Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 27 Nov 2014 09:54:16 -0500
Subject: [PATCH 08/30] Fix coding style

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/structure.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index f951f4428b..8a3988de7e 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -339,7 +339,8 @@ function PMA_getHtmlForCheckAllTables($pmaThemeImage, $text_dir,
         $html_output .= '<option value="copy_tbl_change_prefix" >'
             . __('Copy table with prefix') . '</option>' . "\n";
         if (isset($GLOBALS['cfgRelation']['central_columnswork'])
-        && $GLOBALS['cfgRelation']['central_columnswork']) {
+            && $GLOBALS['cfgRelation']['central_columnswork']
+        ) {
             $html_output .= '<option value="sync_unique_columns_central_list" >'
                 . __('Add columns to central list') . '</option>' . "\n";
             $html_output .= '<option value="delete_unique_columns_central_list" >'

From 93af3b758e37f2daee24e21c10b85b19235fed8a Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 15:57:21 +0100
Subject: [PATCH 09/30] Translated using Weblate (German)

Currently translated at 99.9% (2976 of 2978 strings)

[CI skip]
---
 po/de.po | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/po/de.po b/po/de.po
index 841526bb07..a4a37f2e93 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: 2014-11-26 08:29-0500\n"
-"PO-Revision-Date: 2014-11-26 14:51+0200\n"
-"Last-Translator: Jan Erik Zassenhaus <jan.zassenhaus@jgerman.de>\n"
+"PO-Revision-Date: 2014-11-27 15:57+0200\n"
+"Last-Translator: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>\n"
 "Language-Team: German "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/de/>\n"
 "Language: de\n"
@@ -6892,9 +6892,8 @@ msgstr ""
 "pma__pdf_pages[/kbd]."
 
 #: libraries/config/messages.inc.php:622
-#, fuzzy
 msgid "PDF schema: pages table"
-msgstr "PDF Pages Table"
+msgstr "PDF-Schema: Seiten-Tabelle"
 
 #: libraries/config/messages.inc.php:624
 msgid ""
@@ -10269,10 +10268,9 @@ msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "<code>AUTO_INCREMENT</code> nicht für Nullwerte verwenden"
 
 #: libraries/plugins/import/ImportSql.class.php:193
-#, fuzzy
 #| msgid "Read misses"
 msgid "Read as multibytes"
-msgstr "Fehlgeschlagene Leseanfragen"
+msgstr "Als Multibyte lesen"
 
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"

From 2985b19a2f5c01a7cb0719ce7b77a82a790a0d0c Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 16:01:32 +0100
Subject: [PATCH 10/30] Translated using Weblate (German)

Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
---
 po/de.po | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/po/de.po b/po/de.po
index a4a37f2e93..0ba1a5b9c5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@ 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-26 08:29-0500\n"
-"PO-Revision-Date: 2014-11-27 15:57+0200\n"
+"PO-Revision-Date: 2014-11-27 16:01+0200\n"
 "Last-Translator: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>\n"
 "Language-Team: German "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/de/>\n"
@@ -8957,6 +8957,9 @@ msgid ""
 "There are large item groups in navigation panel which may affect the "
 "performance. Consider disabling item grouping in the navigation panel."
 msgstr ""
+"Es gibt große Element-Gruppen im Navigations-Panel. Darunter kann die "
+"Geschwindigkeit leiden. Eventuell sollten Sie das Gruppieren von Elementen "
+"im Navigations-Panel abschalten."
 
 #: libraries/navigation/NavigationTree.class.php:857
 #, php-format
@@ -14010,10 +14013,9 @@ msgid "Display column was successfully updated."
 msgstr "Spaltendarstellung erfolgreich aktualisiert."
 
 #: libraries/tbl_relation.lib.php:900
-#, fuzzy
 #| msgid "Internal relation has been added."
 msgid "Internal relations were successfully updated."
-msgstr "Interne Verknüpfung wurde hinzugefügt."
+msgstr "Interne Verknüpfungen wurden erfolgreich aktualisiert."
 
 #: libraries/tbl_relation.lib.php:1165
 #, php-format

From 8ffcc29ff8d634cad82d9f437368a21f48f4f60d Mon Sep 17 00:00:00 2001
From: Panagiotis Papazoglou <papaz_p@yahoo.com>
Date: Thu, 27 Nov 2014 16:08:37 +0100
Subject: [PATCH 11/30] Translated using Weblate (Greek)

Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
---
 po/el.po | 52 ++++++++++++++++++++++------------------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/po/el.po b/po/el.po
index 071bf0f53d..824c82d9f5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -4,14 +4,14 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-11-26 08:29-0500\n"
-"PO-Revision-Date: 2014-11-15 15:08+0200\n"
+"PO-Revision-Date: 2014-11-27 16:08+0200\n"
 "Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
-"Language-Team: Greek <https://hosted.weblate.org/projects/phpmyadmin/master/"
-"el/>\n"
+"Language-Team: Greek "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/el/>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.1-dev\n"
 
@@ -329,23 +329,23 @@ msgid "Access denied!"
 msgstr "Άρνηση πρόσβασης!"
 
 #: db_tracking.php:38 db_tracking.php:63
-#, fuzzy
 #| msgid "Tracking data definition successfully deleted"
 msgid "Tracking data deleted successfully."
-msgstr "Ο προσδιορισμός των δεδομένων παρακολούθησης διαγράφτηκε επιτυχώς"
+msgstr "Τα δεδομένα παρακολούθησης διαγράφτηκαν επιτυχώς."
 
 #: db_tracking.php:47
-#, fuzzy, php-format
+#, php-format
 #| msgid "Version %1$s was created, tracking for %2$s is active."
 msgid ""
 "Version %1$s was created for selected tables, tracking is active for them."
-msgstr "Η έκδοση %1$s δημιουργήθηκε, η παρακολούθηση του %2$s ενεργοποιήθηκε."
+msgstr ""
+"Η έκδοση %1$s δημιουργήθηκε για επιλεγμένους πίνακες, η παρακολούθηση είναι "
+"ενεργοποιημένη για αυτούς."
 
 #: db_tracking.php:78
-#, fuzzy
 #| msgid "No databases selected."
 msgid "No tables selected."
-msgstr "Δεν έχετε επιλέξει βάσεις δεδομένων."
+msgstr "Δεν επιλέχθηκαν πίνακες."
 
 #: db_tracking.php:112
 msgid "Tracked tables"
@@ -392,10 +392,9 @@ msgid "Delete tracking data for this table"
 msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα"
 
 #: db_tracking.php:145 db_tracking.php:207
-#, fuzzy
 #| msgid "Deleting tracking data"
 msgid "Delete tracking"
-msgstr "Διαγραφή δεδομένων παρακολούθησης"
+msgstr "Διαγραφή παρακολούθησης"
 
 #: db_tracking.php:183
 msgid "Versions"
@@ -952,28 +951,24 @@ msgid "You are about to TRUNCATE a complete table!"
 msgstr "Πρόκειται να TRUNCATE έναν ολόκληρο πίνακα!"
 
 #: js/messages.php:40
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data for this table?"
-msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα"
+msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα;"
 
 #: js/messages.php:41
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data for these tables?"
-msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα"
+msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτούς τους πίνακες;"
 
 #: js/messages.php:42
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data for this version?"
-msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα"
+msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτήν την έκδοση;"
 
 #: js/messages.php:43
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data for these versions?"
-msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα"
+msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτές τις εκδόσεις;"
 
 #: js/messages.php:44
 msgid "Deleting tracking data"
@@ -13982,10 +13977,10 @@ msgid "Create version %1$s of %2$s"
 msgstr "Δημιουργία έκδοσης %1$s του %2$s"
 
 #: libraries/tracking.lib.php:73
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create version"
 msgid "Create version %1$s"
-msgstr "Δημιουργία έκδοσης"
+msgstr "Δημιουργία έκδοσης %1$s"
 
 #: libraries/tracking.lib.php:78
 msgid "Track these data definition statements:"
@@ -14018,10 +14013,9 @@ msgid "Deactivate now"
 msgstr "Απενεργοποιήση τώρα"
 
 #: libraries/tracking.lib.php:258 libraries/tracking.lib.php:312
-#, fuzzy
 #| msgid "Create version"
 msgid "Delete version"
-msgstr "Δημιουργία έκδοσης"
+msgstr "Διαγραφή έκδοσης"
 
 #: libraries/tracking.lib.php:377 libraries/tracking.lib.php:1386
 msgid "active"
@@ -14135,10 +14129,10 @@ msgid "Tracking for %1$s was deactivated at version %2$s."
 msgstr "Παρακολούθηση του %1$s απενεργοποιήθηκε στην έκδοση %2$s."
 
 #: libraries/tracking.lib.php:1258
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create version %1$s of %2$s"
 msgid "Version %1$s of %2$s was deleted."
-msgstr "Δημιουργία έκδοσης %1$s του %2$s"
+msgstr "Η έκδοση %1$s από %2$s διαγράφτηκε."
 
 #: libraries/tracking.lib.php:1289
 #, php-format
@@ -14503,16 +14497,14 @@ msgid "Tracking of %s is activated."
 msgstr "Παρακολούθηση του %s ενεργοποιήθηκε."
 
 #: tbl_tracking.php:100
-#, fuzzy
 #| msgid "The selected users have been deleted successfully."
 msgid "Tracking versions deleted successfully."
-msgstr "Οι επιλεγμένοι χρήστες διεγράφησαν επιτυχώς."
+msgstr "Οι παρακολουθούμενες εκδόσεις διεγράφησαν επιτυχώς."
 
 #: tbl_tracking.php:105
-#, fuzzy
 #| msgid "No rows selected"
 msgid "No versions selected."
-msgstr "Δεν επιλέχθηκαν γραμμές"
+msgstr "Δεν επιλέχθηκαν εκδόσεις."
 
 #: tbl_tracking.php:132
 msgid "SQL statements executed."

From f14a051e1b1d25d3647a894309360b39890f52e6 Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 16:38:50 +0100
Subject: [PATCH 12/30] [TEST] Fix failing test after 3d87430

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
---
 test/classes/PMA_DisplayResults_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php
index f690f7345b..c169090065 100644
--- a/test/classes/PMA_DisplayResults_test.php
+++ b/test/classes/PMA_DisplayResults_test.php
@@ -1619,7 +1619,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 . '<input type="hidden" name="pos" value="0" />'
                 . '<input type="hidden" name="session_max_rows" value="all" />'
                 . '<input type="hidden" name="goto" value="tbl_structure.php" />'
-                . '<input type="checkbox" name="navig" class="showAllRows" value="all" />'
+                . '<input type="checkbox" name="navig" id="navig" class="showAllRows" value="all" />'
                 . '<label for="navig">Show all</label></form></td>'
             )
         );

From 36e49e496c26a3c9828d8ed0612f8d51eced3e69 Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 16:42:25 +0100
Subject: [PATCH 13/30] [DOC] Add ChangeLog entry for bug #4609

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 5d10fa5abd..cc5b13f8c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.3.1.0 (not yet released)
+- bug #4609 'Show all' checkbox label is not clickable
 
 4.3.0.0 (not yet released)
 + rfe #1502 Smart sorting for int keys

From b779a1881b205afa28432f728ccf92ff07ad1d28 Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 16:07:36 +0100
Subject: [PATCH 14/30] Translated using Weblate (German)

Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
---
 po/de.po | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/po/de.po b/po/de.po
index e08969c3a6..79f5d43b8b 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: 2014-11-13 11:57-0500\n"
-"PO-Revision-Date: 2014-11-26 14:51+0200\n"
-"Last-Translator: Jan Erik Zassenhaus <jan.zassenhaus@jgerman.de>\n"
+"PO-Revision-Date: 2014-11-27 16:07+0200\n"
+"Last-Translator: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>\n"
 "Language-Team: German "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-3/de/>\n"
 "Language: de\n"
@@ -761,7 +761,7 @@ msgstr "Server-Typ:"
 #: libraries/plugins/export/ExportSql.class.php:681
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
-msgstr "Server Version:"
+msgstr "Server-Version:"
 
 #: index.php:279
 msgid "Protocol version:"
@@ -773,7 +773,7 @@ msgstr "Benutzer:"
 
 #: index.php:288
 msgid "Server charset:"
-msgstr "Server Zeichensatz:"
+msgstr "Server-Zeichensatz:"
 
 #: index.php:303
 msgid "Web server"
@@ -910,8 +910,8 @@ msgstr ""
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
-"Oder wechseln Sie in einer beliebigen Datenbank zum Reiter „Operationen“ um "
-"die Einstellung vorzunehmen."
+"Oder wechseln Sie in einer beliebigen Datenbank zum Tab „Operationen“, um "
+"die Einstellung dort vorzunehmen."
 
 #: index.php:572
 #, php-format
@@ -2896,7 +2896,7 @@ msgstr "Lesezeichen"
 
 #: libraries/Console.class.php:218
 msgid "Press Ctrl+Enter to execute query"
-msgstr "Drücken sie Strg+Enter um die Abfrage auszuführen"
+msgstr "Drücken Sie Strg+Enter, um die Abfrage auszuführen"
 
 #: libraries/Console.class.php:239
 msgid "During current session"
@@ -3766,7 +3766,7 @@ msgstr "Letzte Tabellen"
 
 #: libraries/RecentFavoriteTable.class.php:267
 msgid "Recent"
-msgstr "Neulich"
+msgstr "Letzte"
 
 #: libraries/RecentFavoriteTable.class.php:269
 #: libraries/config/messages.inc.php:467
@@ -6854,9 +6854,8 @@ msgstr ""
 "pma__pdf_pages[/kbd]."
 
 #: libraries/config/messages.inc.php:622
-#, fuzzy
 msgid "PDF schema: pages table"
-msgstr "PDF Pages Table"
+msgstr "PDF-Schema: Seiten-Tabelle"
 
 #: libraries/config/messages.inc.php:624
 msgid ""
@@ -8920,6 +8919,9 @@ msgid ""
 "There are large item groups in navigation panel which may affect the "
 "performance. Consider disabling item grouping in the navigation panel."
 msgstr ""
+"Es gibt große Element-Gruppen im Navigations-Panel. Darunter kann die "
+"Geschwindigkeit leiden. Eventuell sollten Sie das Gruppieren von Elementen "
+"im Navigations-Panel abschalten."
 
 #: libraries/navigation/NavigationTree.class.php:851
 #, php-format
@@ -10231,10 +10233,9 @@ msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "<code>AUTO_INCREMENT</code> nicht für Nullwerte verwenden"
 
 #: libraries/plugins/import/ImportSql.class.php:193
-#, fuzzy
 #| msgid "Read misses"
 msgid "Read as multibytes"
-msgstr "Fehlgeschlagene Leseanfragen"
+msgstr "Als Multibyte lesen"
 
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
@@ -12233,7 +12234,7 @@ msgstr ""
 "Um Abfragen aus den Logs anzuzeigen, wählen Sie die relevante Zeitspanne in "
 "einem Diagramm durch Drücken der linken Maustaste und markieren Sie einen "
 "Bereich des Diagramms durch Ziehen. Dadurch wird eine Tabelle von "
-"gruppierten Abfragen geladen. Sie können auf jedes SELECT Anweisung klicken, "
+"gruppierten Abfragen geladen. Sie können auf jede SELECT-Anweisung klicken, "
 "um diese weiter zu analysieren."
 
 #: libraries/server_status_monitor.lib.php:147
@@ -13980,10 +13981,9 @@ msgid "Display column was successfully updated."
 msgstr "Spaltendarstellung erfolgreich aktualisiert."
 
 #: libraries/tbl_relation.lib.php:900
-#, fuzzy
 #| msgid "Internal relation has been added."
 msgid "Internal relations were successfully updated."
-msgstr "Interne Verknüpfung wurde hinzugefügt."
+msgstr "Interne Verknüpfungen wurden erfolgreich aktualisiert."
 
 #: libraries/tbl_relation.lib.php:1165
 #, php-format

From 2e9b80e9e325aa6135a1e26346ac5c67bf7cee87 Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 16:45:20 +0100
Subject: [PATCH 15/30] [DOC] Add ChangeLog entry for bug #4610

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index cc5b13f8c1..f4d3f6379c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.3.1.0 (not yet released)
 - bug #4609 'Show all' checkbox label is not clickable
+- bug #4610 JS error reporting: Hash fragment is reset
 
 4.3.0.0 (not yet released)
 + rfe #1502 Smart sorting for int keys

From 19efd36c9ccce73ac423956fd0d77f1e4b795f0d Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 16:07:39 +0100
Subject: [PATCH 16/30] Translated using Weblate (German)

Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
---
 po/de.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/de.po b/po/de.po
index 0ba1a5b9c5..4f033ed947 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@ 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-26 08:29-0500\n"
-"PO-Revision-Date: 2014-11-27 16:01+0200\n"
+"PO-Revision-Date: 2014-11-27 16:07+0200\n"
 "Last-Translator: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>\n"
 "Language-Team: German "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/de/>\n"
@@ -759,7 +759,7 @@ msgstr "Server-Typ:"
 #: libraries/plugins/export/ExportSql.class.php:681
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
-msgstr "Server Version:"
+msgstr "Server-Version:"
 
 #: index.php:292
 msgid "Protocol version:"
@@ -771,7 +771,7 @@ msgstr "Benutzer:"
 
 #: index.php:301
 msgid "Server charset:"
-msgstr "Server Zeichensatz:"
+msgstr "Server-Zeichensatz:"
 
 #: index.php:316
 msgid "Web server"
@@ -908,8 +908,8 @@ msgstr ""
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
-"Oder wechseln Sie in einer beliebigen Datenbank zum Reiter „Operationen“ um "
-"die Einstellung vorzunehmen."
+"Oder wechseln Sie in einer beliebigen Datenbank zum Tab „Operationen“, um "
+"die Einstellung dort vorzunehmen."
 
 #: index.php:585
 #, php-format
@@ -2934,7 +2934,7 @@ msgstr "Lesezeichen"
 
 #: libraries/Console.class.php:218
 msgid "Press Ctrl+Enter to execute query"
-msgstr "Drücken sie Strg+Enter um die Abfrage auszuführen"
+msgstr "Drücken Sie Strg+Enter, um die Abfrage auszuführen"
 
 #: libraries/Console.class.php:239
 msgid "During current session"
@@ -3804,7 +3804,7 @@ msgstr "Letzte Tabellen"
 
 #: libraries/RecentFavoriteTable.class.php:267
 msgid "Recent"
-msgstr "Neulich"
+msgstr "Letzte"
 
 #: libraries/RecentFavoriteTable.class.php:269
 #: libraries/config/messages.inc.php:467
@@ -12272,7 +12272,7 @@ msgstr ""
 "Um Abfragen aus den Logs anzuzeigen, wählen Sie die relevante Zeitspanne in "
 "einem Diagramm durch Drücken der linken Maustaste und markieren Sie einen "
 "Bereich des Diagramms durch Ziehen. Dadurch wird eine Tabelle von "
-"gruppierten Abfragen geladen. Sie können auf jedes SELECT Anweisung klicken, "
+"gruppierten Abfragen geladen. Sie können auf jede SELECT-Anweisung klicken, "
 "um diese weiter zu analysieren."
 
 #: libraries/server_status_monitor.lib.php:147

From b92d3e104786ac58661632965e8a969a23f1983a Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 20 Nov 2014 17:37:39 +0530
Subject: [PATCH 17/30] Workaround for token mismatch error on server session
 timeout for config and http authentication types

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/ajax.js                                        |  4 +++-
 libraries/common.inc.php                          |  2 ++
 .../plugins/auth/AuthenticationConfig.class.php   | 13 +++++++++++++
 .../plugins/auth/AuthenticationCookie.class.php   |  6 +-----
 .../plugins/auth/AuthenticationHttp.class.php     | 15 +++++++++++++++
 .../plugin/auth/PMA_AuthenticationConfig_test.php |  2 ++
 .../plugin/auth/PMA_AuthenticationHttp_test.php   |  2 ++
 7 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/js/ajax.js b/js/ajax.js
index 0f46062f1d..8aaef8f77e 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -443,7 +443,9 @@ var AJAX = {
             AJAX.xhr = null;
             if (parseInt(data.redirect_flag) == 1) {
                 // add one more GET param to display session expiry msg
-                window.location.href += '&session_expired=1';
+                var url = window.location.href;
+                var tokenlessUrl = url.replace(/&?token=[^&#]*/g, "");
+                window.location.href = tokenlessUrl + '&session_expired=1';
                 window.location.reload();
             }
             if (data.fieldWithError) {
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 8df703181e..15b028e0e4 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -470,7 +470,9 @@ if (PMA_checkPageValidity($_REQUEST['back'], $goto_whitelist)) {
  * f.e. lang, server, collation_connection in PMA_Config
  */
 $token_mismatch = true;
+$token_provided = false;
 if (PMA_isValid($_REQUEST['token'])) {
+    $token_provided = true;
     $token_mismatch = ($_SESSION[' PMA_token '] != $_REQUEST['token']);
 }
 
diff --git a/libraries/plugins/auth/AuthenticationConfig.class.php b/libraries/plugins/auth/AuthenticationConfig.class.php
index c6ec919715..1b104d4eb6 100644
--- a/libraries/plugins/auth/AuthenticationConfig.class.php
+++ b/libraries/plugins/auth/AuthenticationConfig.class.php
@@ -27,6 +27,16 @@ class AuthenticationConfig extends AuthenticationPlugin
      */
     public function auth()
     {
+        $response = PMA_Response::getInstance();
+        if ($response->isAjax()) {
+            $response->isSuccess(false);
+            $response->addJSON('redirect_flag', '1');
+            if (defined('TESTSUITE')) {
+                return true;
+            } else {
+                exit;
+            }
+        }
         return true;
     }
 
@@ -37,6 +47,9 @@ class AuthenticationConfig extends AuthenticationPlugin
      */
     public function authCheck()
     {
+        if ($GLOBALS['token_provided'] && $GLOBALS['token_mismatch']) {
+            return false;
+        }
         return true;
     }
 
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index 8291689fdf..1269c4c8c6 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -62,11 +62,7 @@ class AuthenticationCookie extends AuthenticationPlugin
         $response = PMA_Response::getInstance();
         if ($response->isAjax()) {
             $response->isSuccess(false);
-
-            $response->addJSON(
-                'redirect_flag',
-                '1'
-            );
+            $response->addJSON('redirect_flag', '1');
             if (defined('TESTSUITE')) {
                 return true;
             } else {
diff --git a/libraries/plugins/auth/AuthenticationHttp.class.php b/libraries/plugins/auth/AuthenticationHttp.class.php
index a0b73c3c7a..2c1fee8f2a 100644
--- a/libraries/plugins/auth/AuthenticationHttp.class.php
+++ b/libraries/plugins/auth/AuthenticationHttp.class.php
@@ -32,6 +32,17 @@ class AuthenticationHttp extends AuthenticationPlugin
      */
     public function auth()
     {
+        $response = PMA_Response::getInstance();
+        if ($response->isAjax()) {
+            $response->isSuccess(false);
+            $response->addJSON('redirect_flag', '1');
+            if (defined('TESTSUITE')) {
+                return true;
+            } else {
+                exit;
+            }
+        }
+
         /* Perform logout to custom URL */
         if (! empty($_REQUEST['old_usr'])
             && ! empty($GLOBALS['cfg']['Server']['LogoutURL'])
@@ -115,6 +126,10 @@ class AuthenticationHttp extends AuthenticationPlugin
     {
         global $PHP_AUTH_USER, $PHP_AUTH_PW;
 
+        if ($GLOBALS['token_provided'] && $GLOBALS['token_mismatch']) {
+            return false;
+        }
+
         // Grabs the $PHP_AUTH_USER variable whatever are the values of the
         // 'register_globals' and the 'variables_order' directives
         if (empty($PHP_AUTH_USER)) {
diff --git a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php b/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
index 3c39ccd3b1..5653bda9c1 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
+++ b/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
@@ -35,6 +35,8 @@ class PMA_AuthenticationConfig_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['PMA_Config'] = new PMA_Config();
         $GLOBALS['PMA_Config']->enableBc();
         $GLOBALS['server'] = 0;
+        $GLOBALS['token_provided'] = true;
+        $GLOBALS['token_mismatch'] = false;
         $this->object = new AuthenticationConfig();
     }
 
diff --git a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
index a6cbfb24e6..e898d7713f 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
+++ b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
@@ -44,6 +44,8 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase
             "en" => array("English", "US-ENGLISH"),
             "ch" => array("Chinese", "TW-Chinese")
         );
+        $GLOBALS['token_provided'] = true;
+        $GLOBALS['token_mismatch'] = false;
         $this->object = new AuthenticationHttp();
     }
 

From 5e1ab952b88098f6482064499d1b8c12af54aa5a Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 26 Nov 2014 08:41:33 +0530
Subject: [PATCH 18/30] Use a separate flag to avoid confusion

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/ajax.js                                            | 8 +++++---
 libraries/plugins/auth/AuthenticationConfig.class.php | 2 +-
 libraries/plugins/auth/AuthenticationHttp.class.php   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/js/ajax.js b/js/ajax.js
index 8aaef8f77e..2f83f31a69 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -443,9 +443,11 @@ var AJAX = {
             AJAX.xhr = null;
             if (parseInt(data.redirect_flag) == 1) {
                 // add one more GET param to display session expiry msg
-                var url = window.location.href;
-                var tokenlessUrl = url.replace(/&?token=[^&#]*/g, "");
-                window.location.href = tokenlessUrl + '&session_expired=1';
+                window.location.href += '&session_expired=1';
+                window.location.reload();
+            } else if (parseInt(data.reload_flag) == 1) {
+                // remove the token param and reload
+                window.location.href = window.location.href.replace(/&?token=[^&#]*/g, "");
                 window.location.reload();
             }
             if (data.fieldWithError) {
diff --git a/libraries/plugins/auth/AuthenticationConfig.class.php b/libraries/plugins/auth/AuthenticationConfig.class.php
index 1b104d4eb6..30385472ba 100644
--- a/libraries/plugins/auth/AuthenticationConfig.class.php
+++ b/libraries/plugins/auth/AuthenticationConfig.class.php
@@ -30,7 +30,7 @@ class AuthenticationConfig extends AuthenticationPlugin
         $response = PMA_Response::getInstance();
         if ($response->isAjax()) {
             $response->isSuccess(false);
-            $response->addJSON('redirect_flag', '1');
+            $response->addJSON('reload_flag', '1');
             if (defined('TESTSUITE')) {
                 return true;
             } else {
diff --git a/libraries/plugins/auth/AuthenticationHttp.class.php b/libraries/plugins/auth/AuthenticationHttp.class.php
index 2c1fee8f2a..6fc2654bc8 100644
--- a/libraries/plugins/auth/AuthenticationHttp.class.php
+++ b/libraries/plugins/auth/AuthenticationHttp.class.php
@@ -35,7 +35,7 @@ class AuthenticationHttp extends AuthenticationPlugin
         $response = PMA_Response::getInstance();
         if ($response->isAjax()) {
             $response->isSuccess(false);
-            $response->addJSON('redirect_flag', '1');
+            $response->addJSON('reload_flag', '1');
             if (defined('TESTSUITE')) {
                 return true;
             } else {

From ea7ca462e56c83792ddc6c9320215a3566ffbba2 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 26 Nov 2014 09:39:16 +0530
Subject: [PATCH 19/30] Document what these flags do

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/plugins/auth/AuthenticationConfig.class.php | 1 +
 libraries/plugins/auth/AuthenticationCookie.class.php | 1 +
 libraries/plugins/auth/AuthenticationHttp.class.php   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/libraries/plugins/auth/AuthenticationConfig.class.php b/libraries/plugins/auth/AuthenticationConfig.class.php
index 30385472ba..bf7c7af76c 100644
--- a/libraries/plugins/auth/AuthenticationConfig.class.php
+++ b/libraries/plugins/auth/AuthenticationConfig.class.php
@@ -30,6 +30,7 @@ class AuthenticationConfig extends AuthenticationPlugin
         $response = PMA_Response::getInstance();
         if ($response->isAjax()) {
             $response->isSuccess(false);
+            // reload_flag removes the token parameter from the URL and reload
             $response->addJSON('reload_flag', '1');
             if (defined('TESTSUITE')) {
                 return true;
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index 1269c4c8c6..63575674d9 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -62,6 +62,7 @@ class AuthenticationCookie extends AuthenticationPlugin
         $response = PMA_Response::getInstance();
         if ($response->isAjax()) {
             $response->isSuccess(false);
+            // redirect_flag redirects to the loging page
             $response->addJSON('redirect_flag', '1');
             if (defined('TESTSUITE')) {
                 return true;
diff --git a/libraries/plugins/auth/AuthenticationHttp.class.php b/libraries/plugins/auth/AuthenticationHttp.class.php
index 6fc2654bc8..685315618d 100644
--- a/libraries/plugins/auth/AuthenticationHttp.class.php
+++ b/libraries/plugins/auth/AuthenticationHttp.class.php
@@ -35,6 +35,7 @@ class AuthenticationHttp extends AuthenticationPlugin
         $response = PMA_Response::getInstance();
         if ($response->isAjax()) {
             $response->isSuccess(false);
+            // reload_flag removes the token parameter from the URL and reload
             $response->addJSON('reload_flag', '1');
             if (defined('TESTSUITE')) {
                 return true;

From 5c02da89bef87ff7161914662ebb9bf9449d97b2 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 11:01:18 +0530
Subject: [PATCH 20/30] ChangeLog entry for bug #4227

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index f4d3f6379c..6c6de04320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog
 - bug #4243 Super slow page rendering with tens of thousands of DBs
 - bug #4391 Upgraded to 4.2.0, insanely slow now
 + rfe #1537 PHP OpenSSL support for cookie encryption/decryption
+- bug #4227 Token mismatch when using HTTP AUTH and the SESSION expires
 
 4.2.13.0 (not yet released)
 - bug #4604 Query history not being deleted

From 251a2aea780e0fe305ba8e0bdce2a3426e384fc4 Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 20:14:57 +0100
Subject: [PATCH 21/30] Translated using Weblate (German)

Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
---
 po/de.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/de.po b/po/de.po
index 79f5d43b8b..7bbd2c4e38 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@ 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-27 16:07+0200\n"
+"PO-Revision-Date: 2014-11-27 20:14+0200\n"
 "Last-Translator: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>\n"
 "Language-Team: German "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-3/de/>\n"
@@ -7743,7 +7743,7 @@ msgstr "Kein Passwort"
 #: libraries/replication_gui.lib.php:412 libraries/replication_gui.lib.php:853
 #: libraries/server_privileges.lib.php:1493
 msgid "Password:"
-msgstr "Passwort:"
+msgstr "Kennwort:"
 
 #: libraries/display_change_password.lib.php:74
 #: libraries/replication_gui.lib.php:877
@@ -10876,7 +10876,7 @@ msgstr "Benutzername"
 #: libraries/server_privileges.lib.php:1525
 #: libraries/server_privileges.lib.php:2964
 msgid "Password"
-msgstr "Passwort"
+msgstr "Kennwort"
 
 #: libraries/replication_gui.lib.php:435
 msgid "Port:"
@@ -14272,7 +14272,7 @@ msgstr "Dump (Schema) der Datenbanken anzeigen"
 
 #: server_privileges.php:139
 msgid "Username and hostname didn't change."
-msgstr "Nutzername und Rechnername haben sich nicht geändert."
+msgstr "Benutzername und Rechnername haben sich nicht geändert."
 
 #: server_status_processes.php:36
 #, php-format

From eb79ad9181734a77ae956a2add430a1ed08275bd Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 11:09:04 +0530
Subject: [PATCH 22/30] Fix typo

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/plugins/auth/AuthenticationConfig.class.php | 2 +-
 libraries/plugins/auth/AuthenticationCookie.class.php | 2 +-
 libraries/plugins/auth/AuthenticationHttp.class.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/plugins/auth/AuthenticationConfig.class.php b/libraries/plugins/auth/AuthenticationConfig.class.php
index bf7c7af76c..19a8ed2a16 100644
--- a/libraries/plugins/auth/AuthenticationConfig.class.php
+++ b/libraries/plugins/auth/AuthenticationConfig.class.php
@@ -30,7 +30,7 @@ class AuthenticationConfig extends AuthenticationPlugin
         $response = PMA_Response::getInstance();
         if ($response->isAjax()) {
             $response->isSuccess(false);
-            // reload_flag removes the token parameter from the URL and reload
+            // reload_flag removes the token parameter from the URL and reloads
             $response->addJSON('reload_flag', '1');
             if (defined('TESTSUITE')) {
                 return true;
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index 63575674d9..dd315b42f7 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -62,7 +62,7 @@ class AuthenticationCookie extends AuthenticationPlugin
         $response = PMA_Response::getInstance();
         if ($response->isAjax()) {
             $response->isSuccess(false);
-            // redirect_flag redirects to the loging page
+            // redirect_flag redirects to the login page
             $response->addJSON('redirect_flag', '1');
             if (defined('TESTSUITE')) {
                 return true;
diff --git a/libraries/plugins/auth/AuthenticationHttp.class.php b/libraries/plugins/auth/AuthenticationHttp.class.php
index 685315618d..2b2fe7e0cd 100644
--- a/libraries/plugins/auth/AuthenticationHttp.class.php
+++ b/libraries/plugins/auth/AuthenticationHttp.class.php
@@ -35,7 +35,7 @@ class AuthenticationHttp extends AuthenticationPlugin
         $response = PMA_Response::getInstance();
         if ($response->isAjax()) {
             $response->isSuccess(false);
-            // reload_flag removes the token parameter from the URL and reload
+            // reload_flag removes the token parameter from the URL and reloads
             $response->addJSON('reload_flag', '1');
             if (defined('TESTSUITE')) {
                 return true;

From 139150b066ebc970cbc596f57757889658e46d68 Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Thu, 27 Nov 2014 20:15:04 +0100
Subject: [PATCH 23/30] Translated using Weblate (German)

Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
---
 po/de.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/de.po b/po/de.po
index 4f033ed947..f3010ff185 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@ 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-26 08:29-0500\n"
-"PO-Revision-Date: 2014-11-27 16:07+0200\n"
+"PO-Revision-Date: 2014-11-27 20:14+0200\n"
 "Last-Translator: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>\n"
 "Language-Team: German "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/de/>\n"
@@ -7781,7 +7781,7 @@ msgstr "Kein Passwort"
 #: libraries/replication_gui.lib.php:412 libraries/replication_gui.lib.php:853
 #: libraries/server_privileges.lib.php:1493
 msgid "Password:"
-msgstr "Passwort:"
+msgstr "Kennwort:"
 
 #: libraries/display_change_password.lib.php:74
 #: libraries/replication_gui.lib.php:877
@@ -10914,7 +10914,7 @@ msgstr "Benutzername"
 #: libraries/server_privileges.lib.php:1525
 #: libraries/server_privileges.lib.php:2964
 msgid "Password"
-msgstr "Passwort"
+msgstr "Kennwort"
 
 #: libraries/replication_gui.lib.php:435
 msgid "Port:"
@@ -14318,7 +14318,7 @@ msgstr "Dump (Schema) der Datenbanken anzeigen"
 
 #: server_privileges.php:139
 msgid "Username and hostname didn't change."
-msgstr "Nutzername und Rechnername haben sich nicht geändert."
+msgstr "Benutzername und Rechnername haben sich nicht geändert."
 
 #: server_status_processes.php:36
 #, php-format

From 109f08f429b66232d8cb5f732129a038b4691a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 28 Nov 2014 13:44:31 +0100
Subject: [PATCH 24/30] Improve a bit recommendation to use another
 authentication as well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 doc/setup.rst | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/doc/setup.rst b/doc/setup.rst
index dc07ccf71a..b62a2cbe64 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -498,14 +498,15 @@ Securing your phpMyAdmin installation
 The phpMyAdmin team tries hard to make the application secure, however there
 are always ways to make your installation more secure:
 
-* remove ``setup`` directory from phpMyAdmin, you will probably not
-  use it after initial setup
-* properly choose authentication method - :ref:`cookie`
-  is probably the best choice for shared hosting
-* in case you don't want all MySQL users to be able to access
-  phpMyAdmin, you can use :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` to limit them
-* consider hiding phpMyAdmin behind authentication proxy, so that
-  MySQL credentials are not all users need to login
-* if you are afraid of automated attacks, enabling Captcha by
+* Remove ``setup`` directory from phpMyAdmin, you will probably not
+  use it after initial setup.
+* Properly choose authentication method - :ref:`cookie`
+  is probably the best choice for shared hosting.
+* In case you don't want all MySQL users to be able to access
+  phpMyAdmin, you can use :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` to limit them.
+* Consider hiding phpMyAdmin behind authentication proxy, so that
+  users need to authenticate prior to providing MySQL credentials
+  to phpMyAdmin.
+* If you are afraid of automated attacks, enabling Captcha by
   :config:option:`$cfg['CaptchaLoginPublicKey']` and
   :config:option:`$cfg['CaptchaLoginPrivateKey']` might be an option.

From d17215986db6e718ca6b1ecc56424c1e1c66d9f7 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 28 Nov 2014 08:02:01 -0500
Subject: [PATCH 25/30] Improve English

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 doc/setup.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/setup.rst b/doc/setup.rst
index b62a2cbe64..d31508aa1d 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -498,13 +498,13 @@ Securing your phpMyAdmin installation
 The phpMyAdmin team tries hard to make the application secure, however there
 are always ways to make your installation more secure:
 
-* Remove ``setup`` directory from phpMyAdmin, you will probably not
-  use it after initial setup.
-* Properly choose authentication method - :ref:`cookie`
+* Remove the ``setup`` directory from phpMyAdmin, you will probably not
+  use it after the initial setup.
+* Properly choose an authentication method - :ref:`cookie`
   is probably the best choice for shared hosting.
 * In case you don't want all MySQL users to be able to access
   phpMyAdmin, you can use :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` to limit them.
-* Consider hiding phpMyAdmin behind authentication proxy, so that
+* Consider hiding phpMyAdmin behind an authentication proxy, so that
   users need to authenticate prior to providing MySQL credentials
   to phpMyAdmin.
 * If you are afraid of automated attacks, enabling Captcha by

From cbbdf9825a9e09a92f3491a9cb8e2d571e2a3adb Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 28 Nov 2014 10:33:36 -0500
Subject: [PATCH 26/30] Fix code execution path warning

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 export.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/export.php b/export.php
index 2607695f06..5e9765990b 100644
--- a/export.php
+++ b/export.php
@@ -324,6 +324,8 @@ if (!defined('TESTSUITE')) {
             $export_type, $remember_template, $export_plugin, $compression,
             $filename_template
         );
+    } else {
+        $mime_type = '';
     }
 
     // Open file on server if needed

From 1e39ac53d02cabc5476af4371fb3c2f1952de8a7 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 29 Nov 2014 06:49:24 -0500
Subject: [PATCH 27/30] Bug Undefined index menuswork

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog                | 1 +
 libraries/Menu.class.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6c6de04320..efab4ea747 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.3.1.0 (not yet released)
 - bug #4609 'Show all' checkbox label is not clickable
 - bug #4610 JS error reporting: Hash fragment is reset
+- bug       Undefined index menuswork
 
 4.3.0.0 (not yet released)
 + rfe #1502 Smart sorting for int keys
diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php
index fed65e0c7d..17ff365927 100644
--- a/libraries/Menu.class.php
+++ b/libraries/Menu.class.php
@@ -129,7 +129,7 @@ class PMA_Menu
     {
         $allowedTabs = PMA_Util::getMenuTabList($level);
         $cfgRelation = PMA_getRelationsParam();
-        if ($cfgRelation['menuswork']) {
+        if (isset($cfgRelation['menuswork']) && $cfgRelation['menuswork']) {
             $groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
                 . "."
                 . PMA_Util::backquote($GLOBALS['cfg']['Server']['usergroups']);

From 115065b3f6bed29fdfba901a64024314f625795d Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Sat, 29 Nov 2014 14:40:02 +0100
Subject: [PATCH 28/30] Reduce nesting levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/sqlparser.lib.php | 76 ++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 88b8c68e84..21a6498121 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -359,50 +359,50 @@ function PMA_SQP_parse($sql)
                 ) - 1;
                 // ($pos === false)
                 if ($pos < 0) {
-                    if ($c == '`') {
-                        /*
-                         * Behave same as MySQL and accept end of query as end
-                         * of backtick.
-                         * I know this is sick, but MySQL behaves like this:
-                         *
-                         * SELECT * FROM `table
-                         *
-                         * is treated like
-                         *
-                         * SELECT * FROM `table`
-                         */
-                        $pos_quote_separator = /*overload*/mb_strpos(
-                            ' ' . $sql, $GLOBALS['sql_delimiter'], $oldpos + 1
-                        ) - 1;
-                        if ($pos_quote_separator < 0) {
-                            $len += 1;
-                            $sql .= '`';
-                            $sql_array['raw'] .= '`';
-                            $pos = $len;
-                        } else {
-                            $len += 1;
-                            $sql = /*overload*/mb_substr(
-                                $sql, 0, $pos_quote_separator
-                            ) . '`' . /*overload*/mb_substr(
-                                $sql, $pos_quote_separator
-                            );
-                            $sql_array['raw'] = $sql;
-                            $pos = $pos_quote_separator;
-                        }
-                        if (class_exists('PMA_Message')
-                            && $GLOBALS['is_ajax_request'] != true
-                        ) {
-                            PMA_Message::notice(
-                                __('Automatically appended backtick to the end of query!')
-                            )->display();
-                        }
-                    } else {
+                    if ($c != '`') {
                         $debugstr = __('Unclosed quote')
                             . ' @ ' . $startquotepos . "\n"
                             . 'STR: ' . htmlspecialchars($quotetype);
                         PMA_SQP_throwError($debugstr, $sql);
                         return $sql_array;
                     }
+
+                    /*
+                     * Behave same as MySQL and accept end of query as end
+                     * of backtick.
+                     * I know this is sick, but MySQL behaves like this:
+                     *
+                     * SELECT * FROM `table
+                     *
+                     * is treated like
+                     *
+                     * SELECT * FROM `table`
+                     */
+                    $pos_quote_separator = /*overload*/mb_strpos(
+                        ' ' . $sql, $GLOBALS['sql_delimiter'], $oldpos + 1
+                    ) - 1;
+                    if ($pos_quote_separator < 0) {
+                        $len += 1;
+                        $sql .= '`';
+                        $sql_array['raw'] .= '`';
+                        $pos = $len;
+                    } else {
+                        $len += 1;
+                        $sql = /*overload*/mb_substr(
+                            $sql, 0, $pos_quote_separator
+                        ) . '`' . /*overload*/mb_substr(
+                            $sql, $pos_quote_separator
+                        );
+                        $sql_array['raw'] = $sql;
+                        $pos = $pos_quote_separator;
+                    }
+                    if (class_exists('PMA_Message')
+                        && $GLOBALS['is_ajax_request'] != true
+                    ) {
+                        PMA_Message::notice(
+                            __('Automatically appended backtick to the end of query!')
+                        )->display();
+                    }
                 }
 
                 // If the quote is the first character, it can't be

From e037f60015a31367a99f994e864a284e193236a3 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Sat, 29 Nov 2014 16:04:29 +0100
Subject: [PATCH 29/30] Factorization.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/plugins/export/ExportSql.class.php | 124 ++++++++-----------
 1 file changed, 55 insertions(+), 69 deletions(-)

diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
index cea3607014..105d43fc3d 100644
--- a/libraries/plugins/export/ExportSql.class.php
+++ b/libraries/plugins/export/ExportSql.class.php
@@ -1294,29 +1294,11 @@ class ExportSql extends ExportPlugin
                 )) {
                     $has_constraints = 1;
                     // comments -> constraints for dumped tables
-                    if (! isset($sql_constraints)) {
-                        if (isset($GLOBALS['no_constraints_comments'])) {
-                            $sql_constraints = '';
-                        } else {
-                            $sql_constraints = $crlf
-                                . $this->_exportComment()
-                                . $this->_exportComment(
-                                    __('Constraints for dumped tables')
-                                )
-                                . $this->_exportComment();
-                        }
-                    }
-                        // comments for current table
-                    if (! isset($GLOBALS['no_constraints_comments'])) {
-                        $sql_constraints .= $crlf
-                        . $this->_exportComment()
-                        . $this->_exportComment(
-                            __('Constraints for table')
-                            . ' '
-                            . PMA_Util::backquoteCompat($table_alias, $compat)
-                        )
-                        . $this->_exportComment();
-                    }
+                    $sql_constraints = $this->generateComment(
+                        $crlf, $sql_constraints, __('Constraints for dumped tables'),
+                        __('Constraints for table'), $table_alias, $compat
+                    );
+
                     $sql_constraints_query .= 'ALTER TABLE '
                     . PMA_Util::backquoteCompat($table_alias, $compat)
                     . $crlf;
@@ -1338,29 +1320,10 @@ class ExportSql extends ExportPlugin
                     $has_indexes = 1;
 
                     // comments -> indexes for dumped tables
-                    if (! isset($sql_indexes)) {
-                        if (isset($GLOBALS['no_constraints_comments'])) {
-                            $sql_indexes = '';
-                        } else {
-                            $sql_indexes = $crlf
-                                . $this->_exportComment()
-                                . $this->_exportComment(
-                                    __('Indexes for dumped tables')
-                                )
-                                . $this->_exportComment();
-                        }
-                    }
-                    // comments for current table
-                    if (! isset($GLOBALS['no_constraints_comments'])) {
-                        $sql_indexes .= $crlf
-                        . $this->_exportComment()
-                        . $this->_exportComment(
-                            __('Indexes for table')
-                            . ' '
-                            . PMA_Util::backquoteCompat($table_alias, $compat)
-                        )
-                        . $this->_exportComment();
-                    }
+                    $sql_indexes = $this->generateComment(
+                        $crlf, $sql_indexes, __('Indexes for dumped tables'),
+                        __('Indexes for table'), $table_alias, $compat
+                    );
                     $sql_indexes_query_start = 'ALTER TABLE '
                     . PMA_Util::backquoteCompat($table_alias, $compat)
                     . $crlf;
@@ -1376,29 +1339,11 @@ class ExportSql extends ExportPlugin
                     $create_query
                 )) {
                     // comments -> auto increments for dumped tables
-                    if (! isset($sql_auto_increments)) {
-                        if (isset($GLOBALS['no_constraints_comments'])) {
-                            $sql_auto_increments = '';
-                        } else {
-                            $sql_auto_increments = $crlf
-                                . $this->_exportComment()
-                                . $this->_exportComment(
-                                    __('AUTO_INCREMENT for dumped tables')
-                                )
-                                . $this->_exportComment();
-                        }
-                    }
-                    // comments for current table
-                    if (! isset($GLOBALS['no_constraints_comments'])) {
-                        $sql_auto_increments .= $crlf
-                        . $this->_exportComment()
-                        . $this->_exportComment(
-                            __('AUTO_INCREMENT for table')
-                            . ' '
-                            . PMA_Util::backquoteCompat($table_alias, $compat)
-                        )
-                        . $this->_exportComment();
-                    }
+                    $sql_auto_increments = $this->generateComment(
+                        $crlf, $sql_auto_increments,
+                        __('AUTO_INCREMENT for dumped tables'),
+                        __('Indexes for table'), $table_alias, $compat
+                    );
                     $sql_auto_increments .= 'ALTER TABLE '
                     . PMA_Util::backquoteCompat($table_alias, $compat)
                     . $crlf;
@@ -2593,4 +2538,45 @@ class ExportSql extends ExportPlugin
         );
         return $sql_query;
     }
+
+    /**
+     * Generate comment
+     *
+     * @param string $crlf          Carriage return character
+     * @param string $sql_statement SQL statement
+     * @param string $comment1      Comment for dumped table
+     * @param string $comment2      Comment for current table
+     * @param string $table_alias   Table alias
+     * @param string $compat        Compatibility mode
+     *
+     * @return string
+     */
+    protected function generateComment(
+        $crlf, $sql_statement, $comment1, $comment2, $table_alias, $compat
+    ) {
+        if (!isset($sql_statement)) {
+            if (isset($GLOBALS['no_constraints_comments'])) {
+                $sql_statement = '';
+            } else {
+                $sql_statement = $crlf
+                    . $this->_exportComment()
+                    . $this->_exportComment($comment1)
+                    . $this->_exportComment();
+            }
+        }
+
+        // comments for current table
+        if (!isset($GLOBALS['no_constraints_comments'])) {
+            $sql_statement .= $crlf
+                . $this->_exportComment()
+                . $this->_exportComment(
+                    $comment2 . ' ' . PMA_Util::backquoteCompat(
+                        $table_alias, $compat
+                    )
+                )
+                . $this->_exportComment();
+        }
+
+        return $sql_statement;
+    }
 }

From 41277d1887300298e007ae3151af9983a6a384af Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 30 Nov 2014 06:35:21 -0500
Subject: [PATCH 30/30] 4.2.13 release

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 431dde8619..f9835027c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,7 +65,7 @@ phpMyAdmin - ChangeLog
 - bug #4391 Upgraded to 4.2.0, insanely slow now
 + rfe #1537 PHP OpenSSL support for cookie encryption/decryption
 
-4.2.13.0 (not yet released)
+4.2.13.0 (2014-11-30)
 - bug #4604 Query history not being deleted
 - bug #4057 db/table query string parameters no longer work
 - bug #4605 Unseen messages in tracking