From a0edde2a1f303c99af6527fbdc0260f7a8ff508a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20=C3=9Ar?= <urbalazs@gmail.com>
Date: Wed, 31 Dec 2014 16:36:25 +0100
Subject: [PATCH 1/2] Translated using Weblate (Hungarian)

Currently translated at 80.1% (2385 of 2977 strings)

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

diff --git a/po/hu.po b/po/hu.po
index 475fe5f591..e6b3e8c3c5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2948,10 +2948,9 @@ msgid "Queried time"
 msgstr "A lekérdezés végrehajtási ideje"
 
 #: libraries/Console.class.php:195
-#, fuzzy
 #| msgid "SQL Query box"
 msgid "SQL Query Console"
-msgstr "SQL-lekérdezési panelek"
+msgstr "SQL lekérdezés konzol"
 
 #: libraries/Console.class.php:196
 msgid "Console"
@@ -6235,7 +6234,7 @@ msgstr "Írja be a szerver csatlakozási paramétereit"
 
 #: libraries/config/messages.inc.php:266
 msgid "Configuration storage"
-msgstr "Konfigurációs tároló"
+msgstr "Beállítás tároló"
 
 #: libraries/config/messages.inc.php:268
 #, fuzzy
@@ -7870,10 +7869,9 @@ msgid "Skip locked tables"
 msgstr "A zárolt táblák kihagyása"
 
 #: libraries/config/messages.inc.php:742
-#, fuzzy
 #| msgid "A warning is displayed on the main page if Suhosin is detected"
 msgid "A warning is displayed on the main page if Suhosin is detected."
-msgstr "Figyelmeztetés megjelenítése a főoldalon, Suhosin észlelésekor"
+msgstr "Egy figyelmeztetés jelenik meg a főoldalon, ha Suhosin észlelhető."
 
 #: libraries/config/messages.inc.php:743
 msgid "Suhosin warning"

From 8999bc6c657524ecb7f5144e1fed8f03452d9ad0 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 1 Jan 2015 11:00:48 +0530
Subject: [PATCH 2/2] bug #4680 Number of favorite table are not configurable
 in setup

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog                                   | 1 +
 libraries/config/setup.forms.php            | 4 +++-
 libraries/config/user_preferences.forms.php | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dd9a129064..c1c74e132b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #4677 Advanced feature checker does not check for favorite tables feature
 - bug #4678 Some of the data stored in configuration storage are not deleted upon db or table delete
 - bug #4679 Setup does not allow providing a name for favorites table
+- bug #4680 Number of favorite table are not configurable in setup
 
 4.3.4.0 (2014-12-29)
 - bug #4653 Always connection error was shown, on /setup at tab "configuration storage"
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 7307d0c0d4..68b409efb7 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -172,7 +172,9 @@ $forms['Navi_panel']['Navi_panel'] = array(
     'NavigationTreeEnableGrouping',
     'NavigationTreeDisableDatabaseExpansion',
     'NavigationTreeDisplayItemFilterMinimum',
-    'NumRecentTables');
+    'NumRecentTables',
+    'NumFavoriteTables'
+);
 $forms['Navi_panel']['Navi_servers'] = array(
     'NavigationDisplayServers',
     'DisplayServersList');
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 02241c8c89..6792e2e756 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -83,7 +83,9 @@ $forms['Navi_panel']['Navi_panel'] = array(
     'NavigationTreeEnableGrouping',
     'NavigationTreeDisableDatabaseExpansion',
     'NavigationTreeDisplayItemFilterMinimum',
-    'NumRecentTables');
+    'NumRecentTables',
+    'NumFavoriteTables'
+);
 $forms['Navi_panel']['Navi_databases'] = array(
     'NavigationTreeDisplayDbFilterMinimum',
     'NavigationTreeDbSeparator');