From 97977bb3f5b9ba1ebe7975dadc7d08703036313d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 12 Dec 2014 14:01:27 +0100 Subject: [PATCH 1/2] Translated using Weblate (Korean) Currently translated at 83.0% (2473 of 2978 strings) [CI skip] --- po/ko.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 2f82b486e7..83abf28611 100644 --- a/po/ko.po +++ b/po/ko.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-12-11 03:41+0200\n" -"Last-Translator: Dongyoung Kim \n" +"PO-Revision-Date: 2014-12-12 14:01+0200\n" +"Last-Translator: Michal Čihař \n" "Language-Team: Korean " "\n" "Language: ko\n" @@ -4644,7 +4644,7 @@ msgstr "컬럼 선택." #: libraries/central_columns.lib.php:807 libraries/central_columns.lib.php:917 msgid "auto_increment" -msgstr "auto_increment" +msgstr "자동 증가" #: libraries/central_columns.lib.php:809 libraries/central_columns.lib.php:919 #, fuzzy From 38f09694102bcc5313ac72444077f25caae3506f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 12 Dec 2014 13:15:49 -0500 Subject: [PATCH 2/2] bug The "Recently used tables" setting should be with Nav panel Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/config/setup.forms.php | 4 ++-- libraries/config/user_preferences.forms.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b5165de9b..fa612ea6ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.3.3.0 (not yet released) +- bug The "Recently used tables" setting should be with Nav panel 4.3.2.0 (2014-12-12) - bug #4628 PHP error while exporting schema as PDF diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index fee61314f8..f95325421d 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -130,7 +130,6 @@ $forms['Features']['Other_core_settings'] = array( 'InitialSlidersState', 'MaxDbList', 'MaxTableList', - 'NumRecentTables', 'NumFavoriteTables', 'ShowHint', 'OBGzip', @@ -172,7 +171,8 @@ $forms['Navi_panel']['Navi_panel'] = array( 'MaxNavigationItems', 'NavigationTreeEnableGrouping', 'NavigationTreeDisableDatabaseExpansion', - 'NavigationTreeDisplayItemFilterMinimum'); + 'NavigationTreeDisplayItemFilterMinimum', + 'NumRecentTables'); $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 74c17b167d..1fdaf0d32c 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -32,7 +32,6 @@ $forms['Features']['General'] = array( 'DisableMultiTableMaintenance', 'MaxDbList', 'MaxTableList', - 'NumRecentTables', 'NumFavoriteTables', 'ShowHint', 'SendErrorReports' @@ -84,7 +83,8 @@ $forms['Navi_panel']['Navi_panel'] = array( 'MaxNavigationItems', 'NavigationTreeEnableGrouping', 'NavigationTreeDisableDatabaseExpansion', - 'NavigationTreeDisplayItemFilterMinimum'); + 'NavigationTreeDisplayItemFilterMinimum', + 'NumRecentTables'); $forms['Navi_panel']['Navi_databases'] = array( 'NavigationTreeDisplayDbFilterMinimum', 'NavigationTreeDbSeparator');