From eeb32aa0df7b3d66939fa087835968aa13d610af Mon Sep 17 00:00:00 2001 From: Yungu Kim Date: Sun, 6 Apr 2014 11:19:03 +0200 Subject: [PATCH 1/7] Translated using Weblate (Korean) Currently translated at 78.6% (2164 of 2750) --- po/ko.po | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/po/ko.po b/po/ko.po index eb26a0f6d1..4cf535d40b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.13-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-03-27 13:53+0100\n" -"PO-Revision-Date: 2014-04-02 12:00+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2014-04-06 11:19+0200\n" +"Last-Translator: Yungu Kim \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -10188,21 +10188,21 @@ msgstr "테이블 %s에 대하여 일치하는 것들을 삭제 하겠습니까? #: libraries/server_privileges.lib.php:2426 msgid "" "… revoke all active privileges from the old one and delete it afterwards." -msgstr "" +msgstr "... 이전 버전의 모든 활성화된 권한을 취소한 후 이전 버전을 삭제합니다." #: libraries/server_privileges.lib.php:2430 msgid "" "… delete the old one from the user tables and reload the privileges " "afterwards." -msgstr "" +msgstr "... 사용자 테이블로부터 이전 것을 삭제하고, 권한 정보를 새로고침 합니다." #: libraries/server_privileges.lib.php:2444 msgid "Change Login Information / Copy User" -msgstr "" +msgstr "로그인 정보 변경 / 사용자 복사" #: libraries/server_privileges.lib.php:2450 msgid "Create a new user with the same privileges and …" -msgstr "" +msgstr "새로운 사용자를 동일한 권한으로 생성하고 …" #: libraries/server_privileges.lib.php:2730 msgid "Column-specific privileges" @@ -10210,15 +10210,15 @@ msgstr "열(칼럼)에 관한 권한" #: libraries/server_privileges.lib.php:2785 msgid "Add privileges on the following database:" -msgstr "" +msgstr "다음 데이터베이스에 대한 권한 추가:" #: libraries/server_privileges.lib.php:2812 msgid "Wildcards % and _ should be escaped with a \\ to use them literally." -msgstr "" +msgstr "%와 _는 와일드카드입니다. 일반 문자처럼 사용하려면 \\를 앞에 붙이세요." #: libraries/server_privileges.lib.php:2830 msgid "Add privileges on the following table:" -msgstr "" +msgstr "다음 테이블에 대한 권한 추가:" #: libraries/server_privileges.lib.php:3074 msgid "Remove selected users" @@ -10236,7 +10236,7 @@ msgstr "사용자명과 같은 이름의 데이터베이스를 삭제합니다." #: libraries/server_privileges.lib.php:3231 msgid "No users selected for deleting!" -msgstr "" +msgstr "삭제할 사용자를 선택하세요!" #: libraries/server_privileges.lib.php:3234 msgid "Reloading the privileges" @@ -10266,16 +10266,15 @@ msgid "The user %s already exists!" msgstr "사용자 %s 가 이미 존재합니다!" #: libraries/server_privileges.lib.php:3646 -#, fuzzy, php-format +#, php-format #| msgid "Privileges" msgid "Privileges for %s" -msgstr "사용권한" +msgstr "%s에 대한 권한" #: libraries/server_privileges.lib.php:3700 -#, fuzzy #| msgid "Privileges" msgid "Edit Privileges:" -msgstr "사용권한" +msgstr "권한 수정:" #: libraries/server_privileges.lib.php:3761 libraries/server_users.lib.php:25 msgid "Users overview" @@ -10289,6 +10288,8 @@ msgid "" "server uses, if they have been changed manually. In this case, you should " "%sreload the privileges%s before you continue." msgstr "" +"주의: phpMyAdmin은 사용자의 권한 정보를 MySQL의 privilege 테이블에서 가져옵니다. 만약 수동으로 서버의 권한 정보를 " +"수정하였다면, 서버의 정보와 맞지 않을 수 있습니다. 이 경우, %sreload the privileges%s를 먼저 수행하세요." #: libraries/server_privileges.lib.php:3886 msgid "The selected user was not found in the privilege table." @@ -10312,7 +10313,7 @@ msgstr "이 MySQL 서버는 %1$s 동안 구동되었습니다. 구동 시작날 msgid "" "This MySQL server works as master and slave in replication process." -msgstr "" +msgstr "이 MySQL 서버는 리플리케이션 작업시 마스터와 슬레이브로 동작합니다." #: libraries/server_status.lib.php:84 msgid "This MySQL server works as master in replication process." @@ -12673,10 +12674,12 @@ msgid "" "You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable " "version is %s, released on %s." msgstr "" +"Git 버전을 사용하고 있습니다. [kbd]git pull[/kbd]을 실행하세요 :-)[br]최신 안정 버전은 %s이며 %s에 " +"공개되었습니다." #: setup/lib/index.lib.php:172 msgid "No newer stable version is available" -msgstr "" +msgstr "더 최신의 안정 버전이 없음" #: setup/lib/index.lib.php:218 #, php-format @@ -12866,10 +12869,9 @@ msgid "Available MIME types" msgstr "사용가능한 MIME 형식" #: transformation_overview.php:35 -#, fuzzy #| msgid "Version information" msgid "Available transformations" -msgstr "버전 정보" +msgstr "이용 가능한 변환 기능" #: transformation_overview.php:40 msgctxt "for MIME transformation" @@ -12920,10 +12922,9 @@ msgid "The uptime is only %s" msgstr "업타임이 %s 밖에 되지 않습니다" #: libraries/advisory_rules.txt:56 -#, fuzzy #| msgid "Questions" msgid "Questions below 1,000" -msgstr "질의" +msgstr "질문 수가 1,000 미만" #: libraries/advisory_rules.txt:59 msgid "" From 2186e0fc2b75b891e8e88912268fc93455bbf519 Mon Sep 17 00:00:00 2001 From: Luis Eduardo Braschi Date: Mon, 7 Apr 2014 05:07:27 +0200 Subject: [PATCH 2/7] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2750 of 2750) --- po/pt_BR.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index b59dfd1c3e..278b84a752 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.13-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-03-27 13:53+0100\n" -"PO-Revision-Date: 2014-04-06 22:36+0200\n" -"Last-Translator: Crisley nunes de souza \n" +"PO-Revision-Date: 2014-04-07 05:07+0200\n" +"Last-Translator: Luis Eduardo Braschi \n" "Language-Team: Portuguese (Brazil) " "\n" "Language: pt_BR\n" @@ -9927,8 +9927,8 @@ msgid "" "The current page has references to tables that no longer exist. Would you " "like to delete those references?" msgstr "" -"A página atual contêm referências para tabelas que não existem. Gostaria de " -"eliminar estas referências?" +"A página atual contém referências para tabelas que não existem. Gostaria de " +"eliminar essas referências?" #: libraries/schema/User_Schema.class.php:572 msgid "Toggle scratchboard" @@ -9941,7 +9941,7 @@ msgstr "Arquivo não existe" #: libraries/schema/User_Schema.class.php:679 #| msgid "SQL Validator is disabled" msgid "Plugin is disabled" -msgstr "Plugin SQL esta desativado" +msgstr "Plugin está desativado" #: libraries/select_lang.lib.php:542 libraries/select_lang.lib.php:551 #: libraries/select_lang.lib.php:560 From 1d219a3435434d01068510ef8755202a76b21855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 7 Apr 2014 11:41:49 +0200 Subject: [PATCH 3/7] Translated using Weblate (Russian) Currently translated at 95.5% (2627 of 2750) --- po/ru.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index eae1c9d70e..142dcd01fb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.13-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-03-27 13:53+0100\n" -"PO-Revision-Date: 2014-02-02 10:56+0200\n" +"PO-Revision-Date: 2014-04-07 11:41+0200\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Russian \n" +"Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 1.9-dev\n" #: changelog.php:36 license.php:28 @@ -1106,7 +1106,7 @@ msgstr "Кешированная память" #: js/messages.php:92 msgid "Buffered memory" -msgstr "Беферизованная память" +msgstr "Буферизованная память" #: js/messages.php:93 msgid "Free memory" From b21c43245d0d3bcf6adbea87e5a85bce1b63dc6f Mon Sep 17 00:00:00 2001 From: Smita Kumari Date: Wed, 9 Apr 2014 22:07:38 +0530 Subject: [PATCH 4/7] bugfix 4346: if exeTimeLimit is set to zero then export timeout won't occur so need to check for it Signed-off-by: Smita Kumari --- export.php | 2 +- js/export.js | 5 ++++- libraries/display_export.lib.php | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/export.php b/export.php index cac8b3c8b0..41e72e3281 100644 --- a/export.php +++ b/export.php @@ -26,7 +26,7 @@ if (!defined('TESTSUITE')) { if (isset($_SESSION['pma_export_error'])) { $err = $_SESSION['pma_export_error']; unset($_SESSION['pma_export_error']); - echo $err; + echo "timeout"; } else { echo "success"; } diff --git a/js/export.js b/js/export.js index 03dd329249..32e2357594 100644 --- a/js/export.js +++ b/js/export.js @@ -220,6 +220,9 @@ function toggle_quick_or_custom() var time_out; function check_time_out(time_limit) { + if(typeof time_limit === 'undefined' || time_limit === 0) { + return true; + } //margin of one second to avoid race condition to set/access session variable time_limit = time_limit + 1; var href = "export.php"; @@ -231,7 +234,7 @@ function check_time_out(time_limit) clearTimeout(time_out); time_out = setTimeout(function(){ $.get(href, params, function (data) { - if (data['message'] !== 'success') { + if (data['message'] === 'timeout') { PMA_ajaxShowMessage( '
' + PMA_messages.strTimeOutError + diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index eca617997c..43db0f6bf5 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -291,7 +291,11 @@ function PMA_getHtmlForExportOptionsFormat($export_list) __('SQL compatibility mode'), 'mysql', '50027', '14515' ); global $cfg; - $html .= ''; + if($cfg['ExecTimeLimit'] > 0) { + $html .= ''; + } else { //if the time limit set is zero, then time out won't occur So no need to check for time out. + $html .= ''; + } $html .= '
'; return $html; From 6dcf2c9355f6603885aaa068d83fe50d2a892a65 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Wed, 9 Apr 2014 17:00:46 +0200 Subject: [PATCH 5/7] Translated using Weblate (Interlingua) Currently translated at 43.4% (1194 of 2750) --- po/ia.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/po/ia.po b/po/ia.po index f20ea132f3..7db976e422 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.13-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-03-27 13:53+0100\n" -"PO-Revision-Date: 2014-03-31 11:40+0200\n" +"PO-Revision-Date: 2014-04-09 17:00+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -5676,15 +5676,15 @@ msgstr "" #: libraries/config/messages.inc.php:343 msgid "MySQL reserved word warning" -msgstr "" +msgstr "Aviso de parola reservate de MySQL" #: libraries/config/messages.inc.php:345 msgid "How to display the menu tabs" -msgstr "" +msgstr "Como monstrar le schedas de menu" #: libraries/config/messages.inc.php:347 msgid "How to display various action links" -msgstr "" +msgstr "Comom monstrar varie ligamines de action" #: libraries/config/messages.inc.php:348 msgid "Disallow BLOB and BINARY columns from editing" @@ -5692,7 +5692,7 @@ msgstr "" #: libraries/config/messages.inc.php:349 msgid "Protect binary columns" -msgstr "" +msgstr "Protege columnas binari" #: libraries/config/messages.inc.php:350 msgid "" @@ -5703,7 +5703,7 @@ msgstr "" #: libraries/config/messages.inc.php:351 msgid "Permanent query history" -msgstr "" +msgstr "Historia permanente de query" #: libraries/config/messages.inc.php:353 msgid "How many queries are kept in history" @@ -5711,7 +5711,7 @@ msgstr "" #: libraries/config/messages.inc.php:354 msgid "Query history length" -msgstr "" +msgstr "Longitude de historia de query" #: libraries/config/messages.inc.php:355 msgid "Tab displayed when opening a new query window" @@ -5719,7 +5719,7 @@ msgstr "" #: libraries/config/messages.inc.php:356 msgid "Default query window tab" -msgstr "" +msgstr "Scheda predefinite de fenestra de query" #: libraries/config/messages.inc.php:357 msgid "Query window height (in pixels)" @@ -5727,7 +5727,7 @@ msgstr "" #: libraries/config/messages.inc.php:358 msgid "Query window height" -msgstr "" +msgstr "Altessa de fenestra de query" #: libraries/config/messages.inc.php:359 msgid "Query window width (in pixels)" @@ -5735,7 +5735,7 @@ msgstr "" #: libraries/config/messages.inc.php:360 msgid "Query window width" -msgstr "" +msgstr "Largessa de fenestra de query" #: libraries/config/messages.inc.php:361 msgid "Select which functions will be used for character set conversion" @@ -5751,7 +5751,7 @@ msgstr "" #: libraries/config/messages.inc.php:364 msgid "Remember table's sorting" -msgstr "" +msgstr "Memora ordine de tabellas" #: libraries/config/messages.inc.php:365 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" @@ -5759,7 +5759,7 @@ msgstr "" #: libraries/config/messages.inc.php:366 msgid "Repeat headers" -msgstr "" +msgstr "Repite capites" #: libraries/config/messages.inc.php:368 msgid "Grid editing: trigger action" From 4e363fc47fb969f9cfab5e7a4da30f3596fb1f3b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 10 Apr 2014 06:05:45 -0400 Subject: [PATCH 6/7] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 73d4b74d26..3b3759547e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #4350 Deleting the DB if it is renamed by the same name - bug #4353 makeProfilingChart is not defined - bug #4355 Precision specifier for DOUBLE type is truncated +- bug #4346 Incorrect "Export incomplete" message 4.1.12.0 (2014-03-27) - bug #4334 Add event : datepicker won't open From abe4702d871faf1d930ea0fd77008a3a9189af25 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 10 Apr 2014 06:08:52 -0400 Subject: [PATCH 7/7] Fix coding style Signed-off-by: Marc Delisle --- js/export.js | 2 +- libraries/display_export.lib.php | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/js/export.js b/js/export.js index 32e2357594..132e7583b3 100644 --- a/js/export.js +++ b/js/export.js @@ -220,7 +220,7 @@ function toggle_quick_or_custom() var time_out; function check_time_out(time_limit) { - if(typeof time_limit === 'undefined' || time_limit === 0) { + if (typeof time_limit === 'undefined' || time_limit === 0) { return true; } //margin of one second to avoid race condition to set/access session variable diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 43db0f6bf5..5ceec0f65b 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -291,9 +291,13 @@ function PMA_getHtmlForExportOptionsFormat($export_list) __('SQL compatibility mode'), 'mysql', '50027', '14515' ); global $cfg; - if($cfg['ExecTimeLimit'] > 0) { - $html .= ''; - } else { //if the time limit set is zero, then time out won't occur So no need to check for time out. + if ($cfg['ExecTimeLimit'] > 0) { + $html .= ''; + } else { + // if the time limit set is zero, then time out won't occur + // So no need to check for time out. $html .= ''; } $html .= '';