From d4b1ec9057390145a931cd45dcc85945c9478c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=84=B1=ED=98=84=20=EC=96=91?= Date: Wed, 14 Aug 2013 05:01:44 +0200 Subject: [PATCH 1/9] Translated using Weblate (Korean) Currently translated at 73.5% (1918 of 2609) --- po/ko.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ko.po b/po/ko.po index 17649cfe9c..637ad43776 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 15:07+0200\n" -"PO-Revision-Date: 2013-08-14 04:38+0200\n" -"Last-Translator: Myung Han Yu \n" +"PO-Revision-Date: 2013-08-14 05:01+0200\n" +"Last-Translator: 성현 양 \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -3946,7 +3946,7 @@ msgstr "사용불가" #: libraries/config/FormDisplay.class.php:765 #, php-format msgid "\"%s\" requires %s extension" -msgstr "\"%s\"는 %s 확장기능을 요구합니다" +msgstr "\"%s\"(은)는 확장기능 %s 이 필요합니다" #: libraries/config/FormDisplay.class.php:784 #, php-format @@ -3960,7 +3960,7 @@ msgstr "(%s) 기능이 누락되어 내보낼 수 없습니다." #: libraries/config/FormDisplay.class.php:800 msgid "SQL Validator is disabled" -msgstr "SQL 유효화검증기가 비활성화되어 있습니다" +msgstr "SQL 검증기능이 비활성화됨" #: libraries/config/FormDisplay.class.php:807 msgid "SOAP extension not found" From 292097c38efaf798a45c5ec4e231cd8673be71e0 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sat, 17 Aug 2013 07:47:44 +0530 Subject: [PATCH 2/9] PMA_SQLPrettyPrint distorted the query in monitor analyzer, bug#4054 --- js/server_status_monitor.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 01dd343fea..21ef49ea25 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -2059,7 +2059,8 @@ AJAX.registerOnload('server_status_monitor.js', function() { var query = rowData.argument || rowData.sql_text; if (codemirror_editor) { - query = PMA_SQLPrettyPrint(query); + //TODO: somehow PMA_SQLPrettyPrint messes up the query, needs be fixed + //query = PMA_SQLPrettyPrint(query); codemirror_editor.setValue(query); // Codemirror is bugged, it doesn't refresh properly sometimes. // Following lines seem to fix that From a715d84e70f6c03bc5994f787468b98b4a0947aa Mon Sep 17 00:00:00 2001 From: philip lim Date: Fri, 16 Aug 2013 04:26:52 +0200 Subject: [PATCH 3/9] Translated using Weblate (Korean) Currently translated at 73.6% (1919 of 2609) --- po/ko.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 637ad43776..34be50b7a3 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 15:07+0200\n" -"PO-Revision-Date: 2013-08-14 05:01+0200\n" -"Last-Translator: 성현 양 \n" +"PO-Revision-Date: 2013-08-16 04:26+0200\n" +"Last-Translator: philip lim \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -4637,7 +4637,7 @@ msgstr "보안" msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" -msgstr "" +msgstr "phpMyAdmin은 유저 인터페이스일 뿐이기에, 그 기능이 MySQL을 제한하지 않음을 이해해 주십시오." #: libraries/config/messages.inc.php:198 msgid "Basic settings" From 19da7e0dfc9e3a433763b2c4e0e0b261ee335961 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 18 Aug 2013 17:03:05 +0530 Subject: [PATCH 4/9] Error wasn't displayed --- js/server_status_monitor.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 21ef49ea25..ff070d72da 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -2117,7 +2117,8 @@ AJAX.registerOnload('server_status_monitor.js', function() { }, function(data) { if (data.success == true) { data = data.message; - } else { + } + if (data.error) { $('#queryAnalyzerDialog div.placeHolder').html('
' + data.error + '
'); return; } From c545c4c7b119e48dcab1e575a1089366a588ce9c Mon Sep 17 00:00:00 2001 From: Dark Killer <66darkkiller66@gmail.com> Date: Sat, 17 Aug 2013 08:54:25 +0200 Subject: [PATCH 5/9] Translated using Weblate (Bulgarian) Currently translated at 76.6% (1998 of 2609) --- po/bg.po | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/po/bg.po b/po/bg.po index 4f71a6e99c..497cc1d02c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,16 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-07-29 15:07+0200\n" -"PO-Revision-Date: 2013-06-07 23:46+0200\n" -"Last-Translator: Pl P \n" -"Language-Team: Bulgarian \n" +"PO-Revision-Date: 2013-08-17 08:54+0200\n" +"Last-Translator: Dark Killer <66darkkiller66@gmail.com>\n" +"Language-Team: Bulgarian \n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.6-dev\n" +"X-Generator: Weblate 1.7-dev\n" #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:344 #: libraries/DisplayResults.class.php:813 @@ -587,7 +586,7 @@ msgstr "Добавяне LineString" #: gis_data_editor.php:304 gis_data_editor.php:378 js/messages.php:319 msgid "Add an inner ring" -msgstr "Добавяне вътрешен пръстен" +msgstr "Добавяне на вътрешен пръстен" #: gis_data_editor.php:325 js/messages.php:314 msgid "Polygon" @@ -595,11 +594,11 @@ msgstr "Многоъгълник" #: gis_data_editor.php:384 js/messages.php:320 msgid "Add a polygon" -msgstr "Добавяне многоъгълник" +msgstr "Добавяне на многоъгълник" #: gis_data_editor.php:390 msgid "Add geometry" -msgstr "Добавяне геометрия" +msgstr "Добави геометрия" #: gis_data_editor.php:399 msgid "Output" @@ -643,8 +642,8 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" -"Опитвате да заредите файл с неподдържана компресия (%s). Или поддръжката ѝ " -"не е реализирана, или е забранена от конфигурацията." +"Опитахте се да заредите файл с неподдържана компресия (%s). Или поддръжката " +"ѝ не е реализирана, или е забранена от конфигурацията." #: import.php:445 msgid "" From ca4370a3c1b0b840a63c845d5856f1fa44421539 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 18 Aug 2013 18:30:39 +0530 Subject: [PATCH 6/9] Show meaningful message if database name is unknown in server's logs, as suggested by Marc --- js/messages.php | 1 + js/server_status_monitor.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/js/messages.php b/js/messages.php index 4a0df5271d..1fe7a24f79 100644 --- a/js/messages.php +++ b/js/messages.php @@ -156,6 +156,7 @@ $js_messages['strUnit'] = __('Unit'); $js_messages['strFromSlowLog'] = __('From slow log'); $js_messages['strFromGeneralLog'] = __('From general log'); +$js_messages['strServerLogError'] = __('The database name is not known for this query in the server\'s logs'); $js_messages['strAnalysingLogsTitle'] = __('Analysing logs'); $js_messages['strAnalysingLogs'] = __('Analysing & loading logs. This may take a while.'); $js_messages['strCancelRequest'] = __('Cancel request'); diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index ff070d72da..dc97ec0729 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -2119,6 +2119,8 @@ AJAX.registerOnload('server_status_monitor.js', function() { data = data.message; } if (data.error) { + if(data.error.indexOf('1146') != -1 || data.error.indexOf('1046') != -1) + data.error = PMA_messages['strServerLogError']; $('#queryAnalyzerDialog div.placeHolder').html('
' + data.error + '
'); return; } From efd6827376267a30234da735d0c9eebfc13ba29f Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 18 Aug 2013 19:53:11 +0530 Subject: [PATCH 7/9] Changelog entry for bug#4054 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index ba1d9d30b1..8579e7b6d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug Missing hints when changing a column's structure - bug #4048 Cannot select foreign value in Search - bug #4025 gzip export is not actually compressed with mod_deflate +- bug #4054 query analysis doesn't launch in status monitor 4.0.5.0 (2013-08-04) - bug #3977 Not detected configuration storage From f35cdacda9e05f85ba041341eee43717a347cef6 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Tue, 20 Aug 2013 14:47:15 +0200 Subject: [PATCH 8/9] Add pmahomme theme icon credits --- themes/pmahomme/info.inc.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/themes/pmahomme/info.inc.php b/themes/pmahomme/info.inc.php index d45f8ee470..0c32532d17 100644 --- a/themes/pmahomme/info.inc.php +++ b/themes/pmahomme/info.inc.php @@ -11,6 +11,11 @@ * If you have problems or questions about this theme email * mikehomme@users.sourceforge.net */ + +/** + * Icon set used by this theme: http://famfamfam.com/lab/icons/silk/ + */ + $theme_name = 'pmahomme'; $theme_full_version = '1.1'; ?> From c439b449d2e47565cb276bf721cdd18deb293fd6 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Tue, 20 Aug 2013 14:48:18 +0200 Subject: [PATCH 9/9] Add Changelog entry for pmahomme icon credits --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 8579e7b6d8..eb7a829f63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug #4048 Cannot select foreign value in Search - bug #4025 gzip export is not actually compressed with mod_deflate - bug #4054 query analysis doesn't launch in status monitor ++ Add pmahomme icon credits (FamFamFam silk icon set) 4.0.5.0 (2013-08-04) - bug #3977 Not detected configuration storage