Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5
Conflicts: ChangeLog
This commit is contained in:
Madhura Jayaratne
commit
2fa2d12cb1
@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
|
||||
- issue #11612 Undefined index: new_row_format
|
||||
- issue #11605 Changing hostname kills password
|
||||
- issue #11614 Undefined variable: db
|
||||
- issue #11627 CREATE TABLE/INSERT INTO executed twice (ctrl+enter)
|
||||
- issue #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given
|
||||
|
||||
4.5.1.0 (2015-10-23)
|
||||
|
||||
@ -1977,23 +1977,19 @@ function bindCodeMirrorToInlineEditor() {
|
||||
codemirror_inline_editor.refresh();
|
||||
codemirror_inline_editor.focus();
|
||||
$(codemirror_inline_editor.getWrapperElement())
|
||||
.bind('keydown', catchKeypressesFromSqlTextboxes);
|
||||
.bind('keydown', catchKeypressesFromSqlInlineEdit);
|
||||
} else {
|
||||
$inline_editor
|
||||
.focus()
|
||||
.bind('keydown', catchKeypressesFromSqlTextboxes);
|
||||
.bind('keydown', catchKeypressesFromSqlInlineEdit);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function catchKeypressesFromSqlTextboxes(event) {
|
||||
function catchKeypressesFromSqlInlineEdit(event) {
|
||||
// ctrl-enter is 10 in chrome and ie, but 13 in ff
|
||||
if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10)) {
|
||||
if ($('#sql_query_edit').length > 0) {
|
||||
$("#sql_query_edit_save").trigger('click');
|
||||
} else if ($('#sqlquery').length > 0) {
|
||||
$("#button_submit_query").trigger('click');
|
||||
}
|
||||
$("#sql_query_edit_save").trigger('click');
|
||||
}
|
||||
}
|
||||
|
||||
@ -4196,13 +4192,10 @@ AJAX.registerOnload('functions.js', function () {
|
||||
if (typeof CodeMirror != 'undefined') {
|
||||
codemirror_editor = PMA_getSQLEditor($elm);
|
||||
codemirror_editor.focus();
|
||||
$(codemirror_editor.getWrapperElement())
|
||||
.bind('keydown', catchKeypressesFromSqlTextboxes);
|
||||
codemirror_editor.on("blur", updateQueryParameters);
|
||||
} else {
|
||||
// without codemirror
|
||||
$elm.focus()
|
||||
.bind('keydown', catchKeypressesFromSqlTextboxes)
|
||||
.bind('blur', updateQueryParameters);
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,8 +4,8 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.5.2-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2015-10-26 19:59-0400\n"
|
||||
"PO-Revision-Date: 2015-10-29 10:27+0200\n"
|
||||
"Last-Translator: zz <tczzjin@gmail.com>\n"
|
||||
"PO-Revision-Date: 2015-10-30 08:36+0200\n"
|
||||
"Last-Translator: disorderman <disorderman@qq.com>\n"
|
||||
"Language-Team: Chinese (China) "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/4-5/zh_CN/>\n"
|
||||
"Language: zh_CN\n"
|
||||
@ -7344,7 +7344,7 @@ msgstr "显示 SQL 查询"
|
||||
#| "Defines whether the query box should stay on-screen after its submission"
|
||||
msgid ""
|
||||
"Defines whether the query box should stay on-screen after its submission."
|
||||
msgstr "声明查询框是否在提交后依然显示在屏幕上."
|
||||
msgstr "查询框在提交后是否依然显示在屏幕上。"
|
||||
|
||||
#: libraries/config/messages.inc.php:886 libraries/sql_query_form.lib.php:351
|
||||
msgid "Retain query box"
|
||||
@ -15267,10 +15267,9 @@ msgstr "于表开头"
|
||||
|
||||
#: templates/table/structure/display_partitions.phtml:3
|
||||
#: templates/table/structure/display_structure.phtml:193
|
||||
#, fuzzy
|
||||
#| msgid "Partition %s"
|
||||
msgid "Partitions"
|
||||
msgstr "分区 %s"
|
||||
msgstr "分区"
|
||||
|
||||
#: templates/table/structure/display_partitions.phtml:7
|
||||
#, fuzzy
|
||||
|
||||
34
po/zh_TW.po
34
po/zh_TW.po
@ -4,16 +4,16 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.5.2-dev\n"
|
||||
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
|
||||
"POT-Creation-Date: 2015-10-26 19:59-0400\n"
|
||||
"PO-Revision-Date: 2015-09-16 05:36+0200\n"
|
||||
"Last-Translator: Chien Wei Lin <cwlin0416@gmail.com>\n"
|
||||
"Language-Team: Chinese (Taiwan) <https://hosted.weblate.org/projects/"
|
||||
"phpmyadmin/4-5/zh_TW/>\n"
|
||||
"PO-Revision-Date: 2015-10-31 16:37+0200\n"
|
||||
"Last-Translator: Kelvin Lee <leekalok804@gmail.com>\n"
|
||||
"Language-Team: Chinese (Taiwan) "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/4-5/zh_TW/>\n"
|
||||
"Language: zh_TW\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
"X-Generator: Weblate 2.4-dev\n"
|
||||
"X-Generator: Weblate 2.5-dev\n"
|
||||
|
||||
#: changelog.php:37 license.php:30
|
||||
#, php-format
|
||||
@ -927,10 +927,9 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?"
|
||||
msgstr "您確定要清空(TRUNCATE)選擇的分區？"
|
||||
|
||||
#: js/messages.php:66
|
||||
#, fuzzy
|
||||
#| msgid "Do you really want to execute \"%s\"?"
|
||||
msgid "Do you really want to RESET SLAVE?"
|
||||
msgstr "您確定要執行 \"%s\"？"
|
||||
msgstr "您確定要執行 RESET SLAVE？"
|
||||
|
||||
#: js/messages.php:68
|
||||
msgid ""
|
||||
@ -3768,7 +3767,7 @@ msgstr "索引 %1$s 和 %2$s 可能是相同的，其中一個將可能被刪除
|
||||
#: libraries/Linter.class.php:96
|
||||
msgid ""
|
||||
"Linting is disabled for this query because it exceeds the maximum length."
|
||||
msgstr "因此查詢已超過最大長度限制，已關閉 Linting。"
|
||||
msgstr "由於此查詢已超過最大長度限制，因此 Linting 已被關閉。"
|
||||
|
||||
#: libraries/Linter.class.php:162
|
||||
#, php-format
|
||||
@ -4820,7 +4819,7 @@ msgstr "屬性"
|
||||
#: libraries/central_columns.lib.php:710
|
||||
#: libraries/central_columns.lib.php:1384
|
||||
msgid "A_I"
|
||||
msgstr "流水號(A_I)"
|
||||
msgstr "自動增加"
|
||||
|
||||
#: libraries/central_columns.lib.php:750
|
||||
msgid "Select a table"
|
||||
@ -11950,22 +11949,19 @@ msgid ""
|
||||
msgstr "允許新增使用者和權限，但不允許重新載入權限表。"
|
||||
|
||||
#: libraries/server_privileges.lib.php:1447
|
||||
#, fuzzy
|
||||
#| msgid "Cookie authentication"
|
||||
msgid "Native MySQL authentication"
|
||||
msgstr "Cookie 認證"
|
||||
msgstr "原生 MySQL 認證"
|
||||
|
||||
#: libraries/server_privileges.lib.php:1449
|
||||
#, fuzzy
|
||||
#| msgid "Signon authentication"
|
||||
msgid "SHA256 password authentication"
|
||||
msgstr "Signon 認證"
|
||||
msgstr "SHA256 密碼認證"
|
||||
|
||||
#: libraries/server_privileges.lib.php:1463
|
||||
#, fuzzy
|
||||
#| msgid "Cookie authentication"
|
||||
msgid "Native MySQL Authentication"
|
||||
msgstr "Cookie 認證"
|
||||
msgstr "原生 MySQL 認證"
|
||||
|
||||
#: libraries/server_privileges.lib.php:1517
|
||||
#: libraries/server_privileges.lib.php:2989
|
||||
@ -12004,10 +12000,9 @@ msgid "Authentication Plugin"
|
||||
msgstr "認證外掛程式"
|
||||
|
||||
#: libraries/server_privileges.lib.php:1787
|
||||
#, fuzzy
|
||||
#| msgid "Password Hashing:"
|
||||
msgid "Password Hashing Method"
|
||||
msgstr "密碼加密方式："
|
||||
msgstr "密碼加密方式"
|
||||
|
||||
#: libraries/server_privileges.lib.php:2058
|
||||
#, php-format
|
||||
@ -13908,7 +13903,7 @@ msgstr "檢視資料庫結構的匯出資料"
|
||||
msgid ""
|
||||
"Username and hostname didn't change. If you only want to change the "
|
||||
"password, 'Change password' tab should be used."
|
||||
msgstr ""
|
||||
msgstr "用戶名與主機名稱尚未更改。如您只需要更改密碼，請使用「修改密碼」分頁。"
|
||||
|
||||
#: server_status.php:39
|
||||
msgid "Not enough privilege to view server status."
|
||||
@ -15010,10 +15005,9 @@ msgid "Description"
|
||||
msgstr "說明"
|
||||
|
||||
#: url.php:36
|
||||
#, fuzzy
|
||||
#| msgid "Taking you to next step…"
|
||||
msgid "Taking you to the target site."
|
||||
msgstr "帶您至下一步驟 …"
|
||||
msgstr "帶您至目標地點。"
|
||||
|
||||
#: user_password.php:34
|
||||
msgid "You don't have sufficient privileges to be here right now!"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
