From 87773296b393aaa6127df59dff59c221eb5ec5b7 Mon Sep 17 00:00:00 2001 From: shanyan baishui Date: Sat, 24 Aug 2013 12:11:11 +0200 Subject: [PATCH 1/4] Translated using Weblate (Simplified Chinese) Currently translated at 99.2% (2589 of 2609) --- po/zh_CN.po | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f3d2bc1553..3f15d6399f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,7 @@ 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-24 09:25+0200\n" +"PO-Revision-Date: 2013-08-24 12:11+0200\n" "Last-Translator: shanyan baishui \n" "Language-Team: Simplified Chinese " "\n" @@ -867,24 +867,24 @@ msgstr "服务器上运行了 Suhosin。请查看%s文档%s了解可能发生的 #: js/messages.php:27 libraries/import.lib.php:118 sql.php:342 msgid "\"DROP DATABASE\" statements are disabled." -msgstr "已经禁用删除数据库 (“DROP DATABASE”) 语句。" +msgstr "已禁用“删除数据库”语句。" #: js/messages.php:30 #, php-format msgid "Do you really want to execute \"%s\"?" -msgstr "您真的要执行\"%s\"吗?" +msgstr "您真的要执行“%s”吗？" #: js/messages.php:31 libraries/mult_submits.inc.php:316 sql.php:464 msgid "You are about to DESTROY a complete database!" -msgstr "您将要删除一个完整的数据库！" +msgstr "您将要完全删除一个数据库！" #: js/messages.php:32 msgid "You are about to DESTROY a complete table!" -msgstr "您将要删除一个完整的数据表！" +msgstr "您将要完全删除一个表！" #: js/messages.php:33 msgid "You are about to TRUNCATE a complete table!" -msgstr "您将要清空一个完整的数据表！" +msgstr "您将要完全清空一个表！" #: js/messages.php:35 msgid "Deleting tracking data" @@ -896,7 +896,7 @@ msgstr "正在删除主键" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" -msgstr "该操作可能需要执行较长时间，确定执行？" +msgstr "该操作可能需要较长时间执行。是否继续？" #: js/messages.php:40 msgid "Missing value in the form!" @@ -951,7 +951,7 @@ msgstr "添加用户" #: js/messages.php:56 msgid "Reloading Privileges" -msgstr "重新载入权限" +msgstr "正在重新载入权限" #: js/messages.php:57 msgid "Removing Selected Users" @@ -1018,7 +1018,7 @@ msgstr "连接 / 进程" #: js/messages.php:79 msgid "Local monitor configuration incompatible" -msgstr "本地监控配置不兼容" +msgstr "本地监控设置不兼容" #: js/messages.php:80 msgid "" @@ -1060,7 +1060,7 @@ msgstr "平均负载" #: js/messages.php:91 msgid "Total memory" -msgstr "内存总数" +msgstr "内存总量" #: js/messages.php:92 msgid "Cached memory" @@ -1080,7 +1080,7 @@ msgstr "已用内存" #: js/messages.php:97 msgid "Total Swap" -msgstr "交换空间总数" +msgstr "交换空间总量" #: js/messages.php:98 msgid "Cached Swap" @@ -1202,27 +1202,27 @@ msgstr "暂停监控" #: js/messages.php:130 msgid "general_log and slow_query_log are enabled." -msgstr "general_log 和 slow_query_log 已启用。" +msgstr "已启用 general_log 和 slow_query_log。" #: js/messages.php:131 msgid "general_log is enabled." -msgstr "general_log 已启用。" +msgstr "已启用 general_log。" #: js/messages.php:132 msgid "slow_query_log is enabled." -msgstr "slow_query_log 已启用。" +msgstr "已启用 slow_query_log。" #: js/messages.php:133 msgid "slow_query_log and general_log are disabled." -msgstr "slow_query_log 和 general_log 已禁用。" +msgstr "未启用 slow_query_log 和 general_log。" #: js/messages.php:134 msgid "log_output is not set to TABLE." -msgstr "log_output 未设置到 TABLE 。" +msgstr "未设置 log_output 为 TABLE。" #: js/messages.php:135 msgid "log_output is set to TABLE." -msgstr "log_output 已设置到 TABLE 。" +msgstr "已设置 log_output 为 TABLE。" #: js/messages.php:136 #, php-format @@ -1231,19 +1231,19 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" -"slow_query_log 已启用，但服务器仅记录查询时间超过 %d 秒的查询。请根据您的系统" -"适当设置 long_query_time 为 0-2 秒。" +"已启用 slow_query_log，但服务器仅记录查询时间超过 %d 秒的查询。请根据您的系统适当设置 long_query_time 为 0-2 " +"秒。" #: js/messages.php:137 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "long_query_time 已设为 %d 秒。" +msgstr "已设置 long_query_time 为 %d 秒。" #: js/messages.php:138 msgid "" "Following settings will be applied globally and reset to default on server " "restart:" -msgstr "下列设置将被应用到整个服务器直到服务器重新启动:" +msgstr "下列设置将被应用到整个服务器直到服务器重新启动：" #. l10n: %s is FILE or TABLE #: js/messages.php:140 @@ -1307,7 +1307,7 @@ msgstr "从慢查询日志" #: js/messages.php:158 msgid "From general log" -msgstr "从通用日志" +msgstr "从常规日志" #: js/messages.php:159 msgid "Analysing logs" @@ -1315,7 +1315,7 @@ msgstr "正在分析日志" #: js/messages.php:160 msgid "Analysing & loading logs. This may take a while." -msgstr "正在加载并分析日志。请稍候。" +msgstr "正在分析并加载日志。请稍候。" #: js/messages.php:161 msgid "Cancel request" From 76e76a09eb7a077449225b0465941bbf2448ce07 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 24 Aug 2013 07:43:05 -0400 Subject: [PATCH 2/4] bug #4051 Wrong tabindex when inserting rows --- ChangeLog | 1 + js/tbl_change.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8c091418ce..a44b4d638e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #4054 query analysis doesn't launch in status monitor + Add pmahomme icon credits (FamFamFam silk icon set) - bug #4064 Table structure statistics "Space usage" caption too small for l10n +- bug #4051 Wrong tabindex when inserting rows 4.0.5.0 (2013-08-04) - bug #3977 Not detected configuration storage diff --git a/js/tbl_change.js b/js/tbl_change.js index a249063b2c..470a8ca4be 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -466,7 +466,7 @@ AJAX.registerOnload('tbl_change.js', function() { // IMO it's not really important to handle the tabindex for // function and Null var tabindex = 0; - $('.textfield') + $('.textfield, .char') .each(function() { tabindex++; $(this).attr('tabindex', tabindex); From 7e5071b6ba6c334f2710a900257f99b20b995cbb Mon Sep 17 00:00:00 2001 From: shanyan baishui Date: Sat, 24 Aug 2013 13:00:16 +0200 Subject: [PATCH 3/4] Translated using Weblate (Simplified Chinese) Currently translated at 99.2% (2589 of 2609) --- po/zh_CN.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 3f15d6399f..63a146ac43 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,7 @@ 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-24 12:11+0200\n" +"PO-Revision-Date: 2013-08-24 13:00+0200\n" "Last-Translator: shanyan baishui \n" "Language-Team: Simplified Chinese " "\n" @@ -1326,20 +1326,18 @@ msgid "" "This column shows the amount of identical queries that are grouped together. " "However only the SQL query itself has been used as a grouping criteria, so " "the other attributes of queries, such as start time, may differ." -msgstr "" -"这一列显示了相同的查询被组合在一起了。然而，有且只有SQL文本被修改过了,因此查" -"询其他属性例如启动时间可能不同。" +msgstr "该列显示了已分组的相同查询数量。然而只有 SQL 查询本身被作为分组依据，所以查询的其它属性，如开始时间可能不同。" #: js/messages.php:163 msgid "" "Since grouping of INSERTs queries has been selected, INSERT queries into the " "same table are also being grouped together, disregarding of the inserted " "data." -msgstr "因选择了分组 INSERT 查询，相同表的 INSERT 查询将被分为一组，忽略数据。" +msgstr "因选择了分组 INSERT 查询，对相同表的 INSERT 查询将忽略插入的数据而被分为一组。" #: js/messages.php:164 msgid "Log data loaded. Queries executed in this time span:" -msgstr "日志数据已加载。查询执行时间为：" +msgstr "已加载日志数据。该时间段执行的查询：" #: js/messages.php:166 msgid "Jump to Log table" @@ -1351,7 +1349,7 @@ msgstr "未找到数据" #: js/messages.php:168 msgid "Log analysed, but no data found in this time span." -msgstr "日志已分析，时间段内没有数据。" +msgstr "已分析日志，但在该时间段内没有找到数据。" #: js/messages.php:170 msgid "Analyzing…" From 8cdc448484a5e31fd7c9a35567aaf2ff16e2d851 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 24 Aug 2013 08:01:24 -0400 Subject: [PATCH 4/4] Other incorrect tabindex (page footer controls) --- js/tbl_change.js | 2 +- libraries/insert_edit.lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 470a8ca4be..28f3b29575 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -473,7 +473,7 @@ AJAX.registerOnload('tbl_change.js', function() { // update the IDs of textfields to ensure that they are unique $(this).attr('id', "field_" + tabindex + "_3"); }); - $('select.control_at_footer') + $('.control_at_footer') .each(function() { tabindex++; $(this).attr('tabindex', tabindex); diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index af5cb90be7..3e57bce0de 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -1483,7 +1483,7 @@ function PMA_getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value */ function PMA_getAfterInsertDropDown($where_clause, $after_insert, $found_unique_key) { - $html_output = '' . ''