From 3e47c3f82bc9d70c9a52da9daf3c2f20338597b2 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sat, 17 Aug 2013 02:24:07 +0530 Subject: [PATCH 01/15] Auto-expand the selected database, feature 1435 --- js/common.js | 16 +++ js/navigation.js | 121 ++++++++++-------- libraries/navigation/NavigationTree.class.php | 3 +- 3 files changed, 83 insertions(+), 57 deletions(-) diff --git a/js/common.js b/js/common.js index c4f4bab7ef..00521c2473 100644 --- a/js/common.js +++ b/js/common.js @@ -41,6 +41,22 @@ var PMA_commonParams = (function () { if (params[i] !== undefined && params[i] !== obj[i]) { reload = true; } + // To expand the database in use and collapse the previous one + if(i == 'db' && obj[i] !== '') { + var $expandElem, $icon; + if(params['db'] !== '' && params['db'] !== obj[i]) { + $expandElem = $('#pma_navigation_tree a.dbLink:contains("' + params['db'] + '")') + .parent().find('a.expander').eq(0); + $icon = $expandElem.find('img'); + if ($icon.is('.ic_b_minus')) + PMA_expandNavigationTree($expandElem); + } + $expandElem = $('#pma_navigation_tree a.dbLink:contains("' + obj[i] + '")') + .parent().find('a.expander').eq(0); + $icon = $expandElem.find('img'); + if ($icon.is('.ic_b_plus')) + PMA_expandNavigationTree($expandElem); + } params[i] = obj[i]; } if (reload) { diff --git a/js/navigation.js b/js/navigation.js index 9198300a87..be02ff2df8 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -29,63 +29,9 @@ $(function() { $('#pma_navigation_tree a.expander').live('click', function(event) { event.preventDefault(); event.stopImmediatePropagation(); - var $this = $(this); - var $children = $this.closest('li').children('div.list_container'); - var $icon = $this.find('img'); - if ($this.hasClass('loaded')) { - if ($icon.is('.ic_b_plus')) { - $icon.removeClass('ic_b_plus').addClass('ic_b_minus'); - $children.show('fast'); - } else { - $icon.removeClass('ic_b_minus').addClass('ic_b_plus'); - $children.hide('fast'); - } - } else { - var $destination = $this.closest('li'); - var $throbber = $('#pma_navigation .throbber') - .first() - .clone() - .css('visibility', 'visible'); - $icon.hide(); - $throbber.insertBefore($icon); - - var searchClause = PMA_fastFilter.getSearchClause(); - var searchClause2 = PMA_fastFilter.getSearchClause2($(this)); - - var params = { - aPath: $(this).find('span.aPath').text(), - vPath: $(this).find('span.vPath').text(), - pos: $(this).find('span.pos').text(), - pos2_name: $(this).find('span.pos2_name').text(), - pos2_value: $(this).find('span.pos2_value').text(), - searchClause: searchClause, - searchClause2: searchClause2 - }; - var url = $('#pma_navigation').find('a.navigation_url').attr('href'); - $.get(url, params, function (data) { - if (data.success === true) { - $this.addClass('loaded'); - $destination.find('div.list_container').remove(); // FIXME: Hack, there shouldn't be a list container there - $destination.append(data.message); - $icon.removeClass('ic_b_plus').addClass('ic_b_minus'); - $destination - .children('div.list_container') - .show('fast'); - if ($destination.find('ul > li').length == 1) { - $destination.find('ul > li') - .find('a.expander.container') - .click(); - } - } else { - PMA_ajaxShowMessage(data.error, false); - } - $icon.show(); - $throbber.remove(); - }); - } - $(this).blur(); + PMA_expandNavigationTree($(this)); }); - + /** * Register event handler for click on the reload * navigation icon at the top of the panel @@ -212,6 +158,69 @@ $(function() { }); }); +/** + * Expands/collapses the navigation tree + * + * @param object $expandElem the element that initiated the expanding + * @return void + */ +function PMA_expandNavigationTree($expandElem) { + var $children = $expandElem.closest('li').children('div.list_container'); + var $icon = $expandElem.find('img'); + if ($expandElem.hasClass('loaded')) { + if ($icon.is('.ic_b_plus')) { + $icon.removeClass('ic_b_plus').addClass('ic_b_minus'); + $children.show('fast'); + } else { + $icon.removeClass('ic_b_minus').addClass('ic_b_plus'); + $children.hide('fast'); + } + } else { + var $destination = $expandElem.closest('li'); + var $throbber = $('#pma_navigation .throbber') + .first() + .clone() + .css('visibility', 'visible'); + $icon.hide(); + $throbber.insertBefore($icon); + + var searchClause = PMA_fastFilter.getSearchClause(); + var searchClause2 = PMA_fastFilter.getSearchClause2($expandElem); + + var params = { + aPath: $expandElem.find('span.aPath').text(), + vPath: $expandElem.find('span.vPath').text(), + pos: $expandElem.find('span.pos').text(), + pos2_name: $expandElem.find('span.pos2_name').text(), + pos2_value: $expandElem.find('span.pos2_value').text(), + searchClause: searchClause, + searchClause2: searchClause2 + }; + var url = $('#pma_navigation').find('a.navigation_url').attr('href'); + $.get(url, params, function (data) { + if (data.success === true) { + $expandElem.addClass('loaded'); + $destination.find('div.list_container').remove(); // FIXME: Hack, there shouldn't be a list container there + $destination.append(data.message); + $icon.removeClass('ic_b_plus').addClass('ic_b_minus'); + $destination + .children('div.list_container') + .show('fast'); + if ($destination.find('ul > li').length == 1) { + $destination.find('ul > li') + .find('a.expander.container') + .click(); + } + } else { + PMA_ajaxShowMessage(data.error, false); + } + $icon.show(); + $throbber.remove(); + }); + } + $expandElem.blur(); +} + /** * Reloads the whole navigation tree while preserving its state * diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index 40900cb09b..388e85405a 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -881,6 +881,7 @@ class PMA_NavigationTree $retval .= ""; } + $dblinkclass = ' class="dbLink"'; $linkClass = ''; $haveAjax = array( 'functions', @@ -942,7 +943,7 @@ class PMA_NavigationTree } else { $title = ''; } - $retval .= ""; + $retval .= ""; $retval .= htmlspecialchars($node->real_name); $retval .= ""; } From 42a8ad5abbeccc98109a25d93d13e2033339bfa8 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sat, 17 Aug 2013 02:28:48 +0530 Subject: [PATCH 02/15] Set to view the expanded database/table --- js/navigation.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/js/navigation.js b/js/navigation.js index be02ff2df8..c3996f4f66 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -159,7 +159,7 @@ $(function() { }); /** - * Expands/collapses the navigation tree + * Expands/collapses the navigation tree and sets to view the expanded * * @param object $expandElem the element that initiated the expanding * @return void @@ -171,6 +171,9 @@ function PMA_expandNavigationTree($expandElem) { if ($icon.is('.ic_b_plus')) { $icon.removeClass('ic_b_plus').addClass('ic_b_minus'); $children.show('fast'); + $('#pma_navigation').animate({ + scrollTop: $children.offset().top + }); } else { $icon.removeClass('ic_b_minus').addClass('ic_b_plus'); $children.hide('fast'); @@ -211,6 +214,9 @@ function PMA_expandNavigationTree($expandElem) { .find('a.expander.container') .click(); } + $('#pma_navigation').animate({ + scrollTop: $destination.children('div.list_container').offset().top + }); } else { PMA_ajaxShowMessage(data.error, false); } From 15d03b227305a46c6ab9b6c1b9ad8c38c35f558f Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sat, 17 Aug 2013 03:02:38 +0530 Subject: [PATCH 03/15] Move autoexpand to a function --- js/common.js | 20 +++++++------------- js/navigation.js | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/js/common.js b/js/common.js index 00521c2473..0fe08b6328 100644 --- a/js/common.js +++ b/js/common.js @@ -43,19 +43,7 @@ var PMA_commonParams = (function () { } // To expand the database in use and collapse the previous one if(i == 'db' && obj[i] !== '') { - var $expandElem, $icon; - if(params['db'] !== '' && params['db'] !== obj[i]) { - $expandElem = $('#pma_navigation_tree a.dbLink:contains("' + params['db'] + '")') - .parent().find('a.expander').eq(0); - $icon = $expandElem.find('img'); - if ($icon.is('.ic_b_minus')) - PMA_expandNavigationTree($expandElem); - } - $expandElem = $('#pma_navigation_tree a.dbLink:contains("' + obj[i] + '")') - .parent().find('a.expander').eq(0); - $icon = $expandElem.find('img'); - if ($icon.is('.ic_b_plus')) - PMA_expandNavigationTree($expandElem); + PMA_autoExpandDatabaseInUse(params['db'], obj[i]); } params[i] = obj[i]; } @@ -87,6 +75,9 @@ var PMA_commonParams = (function () { PMA_querywindow.refresh(); PMA_reloadNavigation(); } + if(name == 'db' && value !== '') { + PMA_autoExpandDatabaseInUse(params['db'], value); + } params[name] = value; return this; }, @@ -124,6 +115,9 @@ var PMA_commonActions = { */ setDb: function (new_db) { if (new_db != PMA_commonParams.get('db')) { + if(new_db !== '') { + PMA_autoExpandDatabaseInUse(PMA_commonParams.get('db'), new_db); + } PMA_commonParams.set('db', new_db); PMA_querywindow.refresh(); } diff --git a/js/navigation.js b/js/navigation.js index c3996f4f66..a17c8213ff 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -227,6 +227,29 @@ function PMA_expandNavigationTree($expandElem) { $expandElem.blur(); } +/* + * Auto-expands the newly chosen database + * + * @param string $oldDb + * @param string $newDb + * + */ +function PMA_autoExpandDatabaseInUse($oldDb, $newDb) { + var $expandElem, $icon; + if($oldDb !== '' && $oldDb !== $newDb) { + $expandElem = $('#pma_navigation_tree a.dbLink:contains("' + $oldDb + '")') + .parent().find('a.expander').eq(0); + $icon = $expandElem.find('img'); + if ($icon.is('.ic_b_minus')) + PMA_expandNavigationTree($expandElem); + } + $expandElem = $('#pma_navigation_tree a.dbLink:contains("' + $newDb + '")') + .parent().find('a.expander').eq(0); + $icon = $expandElem.find('img'); + if ($icon.is('.ic_b_plus')) + PMA_expandNavigationTree($expandElem); +} + /** * Reloads the whole navigation tree while preserving its state * From 454bcffa9e5fcc215a8d4953da9d0f0b82ad83b4 Mon Sep 17 00:00:00 2001 From: Patrick v Date: Sat, 24 Aug 2013 15:18:33 +0200 Subject: [PATCH 04/15] Translated using Weblate (English (United Kingdom)) Currently translated at 99.7% (2600 of 2609) --- po/en_GB.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 93f5cd6a63..9a995734ee 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,16 +6,16 @@ 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-05-31 14:23+0200\n" -"Last-Translator: Robert Readman \n" -"Language-Team: English (United Kingdom) \n" +"PO-Revision-Date: 2013-08-24 15:18+0200\n" +"Last-Translator: Patrick V \n" +"Language-Team: English (United Kingdom) " +"\n" "Language: en_GB\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 @@ -1878,7 +1878,7 @@ msgid "" "edit, checkbox, Edit, Copy and Delete links may not work after saving." msgstr "" "This table does not contain a unique column. Features related to the grid " -"edit, tick-box, Edit, Copy and Delete links may not work after saving." +"edit, checkbox, Edit, Copy and Delete links may not work after saving." #: js/messages.php:350 msgid "You can also edit most values
by double-clicking directly on them." From 8985ffd2cbcab51c688560aebcfe33de8f9234ad Mon Sep 17 00:00:00 2001 From: shanyan baishui Date: Sun, 25 Aug 2013 12:52:01 +0200 Subject: [PATCH 05/15] Translated using Weblate (Simplified Chinese) Currently translated at 99.0% (2583 of 2609) --- po/zh_CN.po | 206 ++++++++++++++++++++++++++-------------------------- 1 file changed, 104 insertions(+), 102 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 63a146ac43..c11a95d96c 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 13:00+0200\n" +"PO-Revision-Date: 2013-08-25 12:52+0200\n" "Last-Translator: shanyan baishui \n" "Language-Team: Simplified Chinese " "\n" @@ -1357,7 +1357,7 @@ msgstr "正在分析…" #: js/messages.php:171 msgid "Explain output" -msgstr "分析输出" +msgstr "解析输出" #: js/messages.php:173 js/messages.php:524 #: libraries/plugins/export/ExportHtmlword.class.php:484 @@ -1369,7 +1369,7 @@ msgstr "时间" #: js/messages.php:174 msgid "Total time:" -msgstr "总时间:" +msgstr "总时间：" #: js/messages.php:175 msgid "Profiling results" @@ -1395,28 +1395,28 @@ msgstr "数据" #. l10n: A collection of available filters #: js/messages.php:182 msgid "Log table filter options" -msgstr "日志表过滤选项" +msgstr "日志表筛选选项" #. l10n: Filter as in "Start Filtering" #: js/messages.php:184 msgid "Filter" -msgstr "快速搜索" +msgstr "筛选" #: js/messages.php:185 msgid "Filter queries by word/regexp:" -msgstr "根据内容/正则表达式搜索:" +msgstr "根据内容/正则表达式筛选：" #: js/messages.php:186 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "忽略 WHERE 语句中的变量值对查询分组" +msgstr "忽略 WHERE 从句中的变量值对查询分组" #: js/messages.php:187 msgid "Sum of grouped rows:" -msgstr "分组后的行数:" +msgstr "分组后的行数：" #: js/messages.php:188 msgid "Total:" -msgstr "总数:" +msgstr "总数：" #: js/messages.php:190 msgid "Loading logs" @@ -1424,16 +1424,14 @@ msgstr "正在加载日志" #: js/messages.php:191 msgid "Monitor refresh failed" -msgstr "监控刷新失败" +msgstr "刷新监控失败" #: js/messages.php:192 msgid "" "While requesting new chart data the server returned an invalid response. " "This is most likely because your session expired. Reloading the page and " "reentering your credentials should help." -msgstr "" -"请求新图表数据时服务器返回了无效数据。这可能是因为会话过期。请尝试重新加载页" -"面。" +msgstr "请求新图表数据时服务器返回了无效数据。这很可能是因为您的会话已过期所造成的。请尝试重新载入页面并重新登录。" #: js/messages.php:193 msgid "Reload page" @@ -1441,16 +1439,16 @@ msgstr "重新载入页面" #: js/messages.php:195 msgid "Affected rows:" -msgstr "影响的行数:" +msgstr "影响的行数：" #: js/messages.php:197 msgid "Failed parsing config file. It doesn't seem to be valid JSON code." -msgstr "解析配置文件失败。它看上去不像有效的 JSON 代码。" +msgstr "解析配置文件失败。它似乎不是有效的 JSON 代码。" #: js/messages.php:198 msgid "" "Failed building chart grid with imported config. Resetting to default config…" -msgstr "导入配置失败。正在重设为默认设置…" +msgstr "使用导入的设置建立图表失败。正在重设为默认设置…" #: js/messages.php:199 libraries/Menu.class.php:305 #: libraries/Menu.class.php:388 libraries/Menu.class.php:499 @@ -1466,9 +1464,10 @@ msgstr "导入监控设置" #: js/messages.php:201 msgid "Please select the file you want to import" -msgstr "请选择要导入的文件" +msgstr "请选择您要导入的文件" #: js/messages.php:203 +#, fuzzy msgid "Analyse Query" msgstr "查询分析" @@ -1490,19 +1489,19 @@ msgstr "建议" #: js/messages.php:211 msgid "Rule details" -msgstr "规则详细" +msgstr "规则细节" #: js/messages.php:212 msgid "Justification" -msgstr "校正" +msgstr "现状" #: js/messages.php:213 msgid "Used variable / formula" -msgstr "已使用的 变量/公式" +msgstr "使用的变量/公式" #: js/messages.php:214 msgid "Test" -msgstr "测试" +msgstr "检验" #: js/messages.php:219 pmd_general.php:437 pmd_general.php:474 #: pmd_general.php:594 pmd_general.php:642 pmd_general.php:718 @@ -1537,7 +1536,7 @@ msgstr "错误信息：%s" #: js/messages.php:227 libraries/db_common.inc.php:58 #: libraries/db_table_exists.lib.php:28 server_databases.php:89 msgid "No databases selected." -msgstr "未选中数据库。" +msgstr "没有已选择的数据库。" #: js/messages.php:228 msgid "Dropping Column" @@ -1555,7 +1554,7 @@ msgstr "确定" #: js/messages.php:231 msgid "Click to dismiss this notification" -msgstr "点击解除这条通知" +msgstr "点击隐藏该提示" #: js/messages.php:234 msgid "Renaming Databases" @@ -1575,9 +1574,10 @@ msgstr "正在修改字符集" #: js/messages.php:238 msgid "Table must have at least one column" -msgstr "数据表至少要有一个字段" +msgstr "表至少要有一个字段" #: js/messages.php:243 +#, fuzzy msgid "Insert Table" msgstr "插入表格" @@ -1591,7 +1591,7 @@ msgstr "显示索引" #: js/messages.php:246 libraries/mult_submits.inc.php:329 msgid "Foreign key check:" -msgstr "检查外键：" +msgstr "外键约束：" #: js/messages.php:247 libraries/mult_submits.inc.php:333 msgid "(Enabled)" @@ -1640,7 +1640,7 @@ msgstr "新字段的值" #: js/messages.php:264 msgid "Enter each value in a separate field" -msgstr "请将每个值分别输入" +msgstr "每个输入框一个值" #: js/messages.php:265 #, php-format @@ -1755,6 +1755,7 @@ msgid "Add columns" msgstr "添加字段" #: js/messages.php:326 +#, fuzzy msgid "Select referenced key" msgstr "选择外键" @@ -1783,7 +1784,7 @@ msgstr "给字段添加选项 " #: js/messages.php:334 #, php-format msgid "%d object(s) created" -msgstr "创建了 %d 个对象" +msgstr "已创建 %d 个对象" #: js/messages.php:337 msgid "Press escape to cancel editing" @@ -1793,7 +1794,7 @@ msgstr "按 Esc 键取消编辑" msgid "" "You have edited some data and they have not been saved. Are you sure you " "want to leave this page before saving the data?" -msgstr "已有数据被修改但尚未保存。你真的要不保存修改就离开本页吗？" +msgstr "您已修改了一些数据但尚未保存。您真的要放弃保存并离开吗？" #: js/messages.php:339 msgid "Drag to reorder" @@ -1809,9 +1810,10 @@ msgstr "点击以标记/取消标记" #: js/messages.php:342 msgid "Double-click to copy column name" -msgstr "双击以复制字段名字" +msgstr "双击以复制字段名" #: js/messages.php:343 +#, fuzzy msgid "Click the drop-down arrow
to toggle column's visibility" msgstr "点击下箭头以设置显示的字段" @@ -1819,21 +1821,19 @@ msgstr "点击下箭头以设置显示的字段" msgid "" "This table does not contain a unique column. Features related to the grid " "edit, checkbox, Edit, Copy and Delete links may not work after saving." -msgstr "" -"该表没有唯一字段。单元格编辑、复选框、编辑、复制和删除链接相关功能可能无法正" -"常使用。" +msgstr "该表没有唯一字段。在保存后单元格编辑、多选、编辑、复制和删除等功能可能无法正常使用。" #: js/messages.php:350 msgid "You can also edit most values
by double-clicking directly on them." -msgstr "您可以直接通过双击来编辑绝大部分字段。" +msgstr "您可以直接双击大部分
单元格以修改其值。" #: js/messages.php:353 msgid "You can also edit most values
by clicking directly on them." -msgstr "您可以直接编辑绝大部分字段
仅仅通过点击就可以实现。" +msgstr "您可以直接点击大部分
单元格以修改其值。" #: js/messages.php:358 msgid "Go to link" -msgstr "转到此链接" +msgstr "打开链接" #: js/messages.php:359 msgid "Copy column name" @@ -1841,9 +1841,10 @@ msgstr "复制字段名" #: js/messages.php:360 msgid "Right-click the column name to copy it to your clipboard." -msgstr "在字段名处右键复制名字到粘贴板。" +msgstr "在字段名上右键以复制到剪贴板。" #: js/messages.php:361 +#, fuzzy msgid "Show data row(s)" msgstr "显示数据行" @@ -1865,27 +1866,27 @@ msgstr "更多" #: js/messages.php:372 msgid "Show Panel" -msgstr "显示面板" +msgstr "显示导航面板" #: js/messages.php:373 msgid "Hide Panel" -msgstr "隐藏面板" +msgstr "隐藏导航面板" #: js/messages.php:376 msgid "The requested page was not found in the history, it may have expired." -msgstr "无法在历史记录中找到请求页面,页面可能已经过期。" +msgstr "没有在历史记录中找到所请求的页面，页面可能已过期。" #: js/messages.php:379 setup/lib/index.lib.php:188 #, php-format msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." -msgstr "有新的 phpMyAdmin 可用，请考虑升级。最新的版本是 %s，于 %s 发布。" +msgstr "phpMyAdmin 有新版本了，请您考虑升级。最新的版本是 %s，于 %s 发布。" #. l10n: Latest available phpMyAdmin version #: js/messages.php:381 msgid ", latest stable version:" -msgstr "，最新稳定版本:" +msgstr "，最新稳定版本：" #: js/messages.php:382 msgid "up to date" @@ -2126,7 +2127,7 @@ msgstr "周" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:514 msgid "calendar-month-year" -msgstr "日历-月-年" +msgstr "calendar-year-month" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:516 @@ -2149,7 +2150,7 @@ msgstr "秒" #: libraries/Advisor.class.php:77 #, php-format msgid "PHP threw following error: %s" -msgstr "php给出下述错误：%s" +msgstr "PHP 抛出下列错误：%s" #: libraries/Advisor.class.php:104 #, php-format @@ -2169,7 +2170,7 @@ msgstr "规则‘%s’运行测试失败" #: libraries/Advisor.class.php:222 #, php-format msgid "Failed formatting string for rule '%s'." -msgstr "格式化字符串 '%s' 失败。" +msgstr "格式化规则‘%s’的字符串时出错。" #: libraries/Advisor.class.php:393 #, php-format @@ -2212,11 +2213,11 @@ msgstr "每天" #: libraries/Config.class.php:1111 #, php-format msgid "Existing configuration file (%s) is not readable." -msgstr "已存在的配置文件(%s)是不可读的。" +msgstr "现有的配置文件（%s）是不可读的。" #: libraries/Config.class.php:1141 msgid "Wrong permissions on configuration file, should not be world writable!" -msgstr "配置文件权限错误，无法写入！" +msgstr "配置文件权限错误，不应任何用户都能修改！" #: libraries/Config.class.php:1715 msgid "Font size" @@ -2249,6 +2250,7 @@ msgid "Criteria" msgstr "条件" #: libraries/DBQbe.class.php:576 +#, fuzzy msgid "Add/Delete criteria rows" msgstr "添加/删除标准行" @@ -2320,13 +2322,13 @@ msgstr "“%s”的搜索结果 %s：" #, php-format msgid "Total: %s match" msgid_plural "Total: %s matches" -msgstr[0] "总计： %s 个匹配" +msgstr[0] "总计：找到 %s 个" #: libraries/DbSearch.class.php:331 #, php-format msgid "%1$s match in %2$s" msgid_plural "%1$s matches in %2$s" -msgstr[0] "在 %2$s 中找到 %1$s 个匹配" +msgstr[0] "在 %2$s 中找到 %1$s 个" #: libraries/DbSearch.class.php:346 libraries/Menu.class.php:267 #: libraries/Util.class.php:3247 libraries/Util.class.php:3460 @@ -2337,7 +2339,7 @@ msgstr "浏览" #: libraries/DbSearch.class.php:353 #, php-format msgid "Delete the matches for the %s table?" -msgstr "删除 %s 表中所有匹配的记录？" +msgstr "删除在 %s 表中找到的所有记录吗？" #: libraries/DbSearch.class.php:357 libraries/DisplayResults.class.php:3390 #: libraries/DisplayResults.class.php:5028 @@ -2356,27 +2358,27 @@ msgstr "在数据库中搜索" #: libraries/DbSearch.class.php:386 msgid "Words or values to search for (wildcard: \"%\"):" -msgstr "要查找的内容 (通配符: \"%\"):" +msgstr "要搜索的内容（通配符：“%”）：" #: libraries/DbSearch.class.php:395 msgid "Find:" -msgstr "查找:" +msgstr "查找：" #: libraries/DbSearch.class.php:400 libraries/DbSearch.class.php:404 msgid "Words are separated by a space character (\" \")." -msgstr "每个单词用空格 (\" \") 分隔。" +msgstr "每个单词用空格（“ ”）分开。" #: libraries/DbSearch.class.php:419 msgid "Inside tables:" -msgstr "于下列表:" +msgstr "于下列表：" #: libraries/DbSearch.class.php:445 msgid "Inside column:" -msgstr "包含字段:" +msgstr "包含字段：" #: libraries/DisplayResults.class.php:702 msgid "Save edited data" -msgstr "保存已编辑的数据" +msgstr "保存已修改的数据" #: libraries/DisplayResults.class.php:708 msgid "Restore column order" @@ -2424,11 +2426,11 @@ msgstr "水平" #: libraries/DisplayResults.class.php:924 msgid "horizontal (rotated headers)" -msgstr "水平 (旋转表头)" +msgstr "水平（旋转表头）" #: libraries/DisplayResults.class.php:925 msgid "vertical" -msgstr "垂直" +msgstr "竖直" #: libraries/DisplayResults.class.php:937 #, php-format @@ -2437,7 +2439,7 @@ msgstr "每 %s 行重复表头" #: libraries/DisplayResults.class.php:1234 msgid "Sort by key" -msgstr "主键排序" +msgstr "按索引排序" #: libraries/DisplayResults.class.php:1582 libraries/TableSearch.class.php:754 #: libraries/import.lib.php:1195 libraries/import.lib.php:1221 @@ -2503,11 +2505,11 @@ msgstr "隐藏浏览器转换" #: libraries/DisplayResults.class.php:1646 msgid "Well Known Text" -msgstr "文本表达式 (WKT)" +msgstr "WKT 文本表达" #: libraries/DisplayResults.class.php:1647 msgid "Well Known Binary" -msgstr "二进制表达式 (WKB)" +msgstr "WKB 二进制表达" #: libraries/DisplayResults.class.php:3363 #: libraries/DisplayResults.class.php:3379 @@ -2521,30 +2523,31 @@ msgstr "杀死" #: libraries/DisplayResults.class.php:4481 libraries/structure.lib.php:771 msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]" -msgstr "可能接近。参见 [doc@faq3-11]FAQ 3.11[/doc]" +msgstr "近似值。参见[doc@faq3-11]常见问题 3.11[/doc]" #: libraries/DisplayResults.class.php:4877 +#, fuzzy msgid "in query" msgstr "查询中" #: libraries/DisplayResults.class.php:4914 libraries/structure.lib.php:653 -#, php-format +#, fuzzy, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." msgstr "该视图最少包含的行数，参见%s文档%s。" #: libraries/DisplayResults.class.php:4927 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows" msgid "Showing rows %1s - %2s" -msgstr "显示行" +msgstr "正在显示第 %1s - %2s 行" #: libraries/DisplayResults.class.php:4939 -#, fuzzy, php-format +#, php-format #| msgid "total" msgid "%d total" -msgstr "总计" +msgstr "共 %d 行" #: libraries/DisplayResults.class.php:4951 sql.php:945 #, php-format @@ -2586,7 +2589,7 @@ msgstr "导出" #: libraries/DisplayResults.class.php:5164 msgid "Query results operations" -msgstr "查询结果选项" +msgstr "查询结果操作" #: libraries/DisplayResults.class.php:5188 libraries/Header.class.php:340 #: libraries/structure.lib.php:299 libraries/structure.lib.php:362 @@ -2596,7 +2599,7 @@ msgstr "打印预览" #: libraries/DisplayResults.class.php:5206 msgid "Print view (with full texts)" -msgstr "打印预览 (全文显示)" +msgstr "打印预览（全文显示）" #: libraries/DisplayResults.class.php:5277 tbl_chart.php:151 msgid "Display chart" @@ -2630,11 +2633,11 @@ msgstr "上传文件的大小超过 php.ini 文件中 upload_max_filesize 的限 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." -msgstr "上传文件的大小超过 HTML 表单中指定的 MAX_FILE_SIZE 值。" +msgstr "上传文件的大小超过 HTML 表单中 MAX_FILE_SIZE 的限制。" #: libraries/File.class.php:285 msgid "The uploaded file was only partially uploaded." -msgstr "仅上传了文件的一部分内容。" +msgstr "文件没有完全上传。" #: libraries/File.class.php:288 msgid "Missing a temporary folder." @@ -2642,11 +2645,11 @@ msgstr "找不到临时文件夹。" #: libraries/File.class.php:291 msgid "Failed to write file to disk." -msgstr "将文件写入磁盘失败。" +msgstr "向磁盘写入文件失败。" #: libraries/File.class.php:294 msgid "File upload stopped by extension." -msgstr "因扩展而停止文件上传。" +msgstr "扩展停止了文件上传。" #: libraries/File.class.php:297 msgid "Unknown error in file upload." @@ -2654,29 +2657,29 @@ msgstr "上传文件时发生未知错误。" #: libraries/File.class.php:475 msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]" -msgstr "移动上传文件时发生错误，参见 [doc@faq1-11]FAQ 1.11[/doc]" +msgstr "移动已上传的文件时发生错误，参见[doc@faq1-11]常见问题 1.11[/doc]" #: libraries/File.class.php:493 msgid "Error while moving uploaded file." -msgstr "移动上传的文件时发生错误。" +msgstr "移动已上传的文件时发生错误。" #: libraries/File.class.php:501 msgid "Cannot read (moved) upload file." -msgstr "无法读取移动后的上传文件。" +msgstr "无法读取（移动后的）上传文件。" #: libraries/Footer.class.php:133 libraries/Footer.class.php:141 #: libraries/Footer.class.php:144 msgid "Open new phpMyAdmin window" -msgstr "打开新 phpMyAdmin 窗口" +msgstr "打开新的 phpMyAdmin 窗口" #: libraries/Header.class.php:398 msgid "Click on the bar to scroll to top of page" -msgstr "点击控制条回滚到页面顶部" +msgstr "点击以滚动到页面顶部" #: libraries/Header.class.php:639 #: libraries/plugins/auth/AuthenticationCookie.class.php:172 msgid "Javascript must be enabled past this point" -msgstr "必须启用 javascript 才能登录" +msgstr "该处必须启用 Javascript" #: libraries/Index.class.php:531 msgid "No index defined!" @@ -2712,7 +2715,7 @@ msgstr "基数" #: libraries/tbl_columns_definition_form.inc.php:842 server_collations.php:38 #: server_collations.php:50 tbl_tracking.php:325 tbl_tracking.php:387 msgid "Collation" -msgstr "整理" +msgstr "排序规则" #: libraries/Index.class.php:570 libraries/rte/rte_events.lib.php:529 #: libraries/rte/rte_routines.lib.php:1068 tbl_tracking.php:329 @@ -2734,7 +2737,7 @@ msgstr "已删除索引 %s" msgid "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." -msgstr "索引 %1$s 和 %2$s 可能是相同的，其中一个将可能被删除。" +msgstr "索引 %1$s 和 %2$s 似乎是相同的，可以删除其中一个。" #: libraries/Menu.class.php:207 libraries/structure.lib.php:677 #: libraries/structure.lib.php:707 libraries/structure.lib.php:1188 @@ -2886,7 +2889,7 @@ msgstr[0] "插入了 %1$d 行。" #: libraries/PDF.class.php:124 msgid "Error while creating PDF:" -msgstr "创建 PDF 时发生错误:" +msgstr "创建 PDF 时发生错误：" #: libraries/RecentTable.class.php:118 msgid "Could not save recent table" @@ -2927,7 +2930,7 @@ msgstr "延迟插入" #: libraries/ServerStatusData.class.php:190 msgid "Key cache" -msgstr "键缓存" +msgstr "索引缓存" #: libraries/ServerStatusData.class.php:191 msgid "Joins" @@ -2943,7 +2946,7 @@ msgstr "排序" #: libraries/navigation/Nodes/Node_Table_Container.class.php:26 #: libraries/plugins/export/ExportXml.class.php:116 msgid "Tables" -msgstr "数据表" +msgstr "表" #: libraries/ServerStatusData.class.php:195 msgid "Transaction coordinator" @@ -2955,7 +2958,7 @@ msgstr "文件" #: libraries/ServerStatusData.class.php:207 msgid "Flush (close) all tables" -msgstr "强制更新 (关闭) 所有表" +msgstr "刷新（关闭）所有表" #: libraries/ServerStatusData.class.php:209 msgid "Show open tables" @@ -2967,7 +2970,7 @@ msgstr "显示从服务器" #: libraries/ServerStatusData.class.php:218 server_replication.php:170 msgid "Show master status" -msgstr "查看主服务器状态" +msgstr "显示主服务器状态" #: libraries/ServerStatusData.class.php:221 msgid "Show slave status" @@ -2975,7 +2978,7 @@ msgstr "显示从服务器状态" #: libraries/ServerStatusData.class.php:226 msgid "Flush query cache" -msgstr "强制更新查询缓存" +msgstr "刷新查询缓存" #: libraries/ServerStatusData.class.php:241 #: libraries/engines/innodb.lib.php:148 @@ -3001,49 +3004,49 @@ msgstr "建议" #: libraries/StorageEngine.class.php:216 msgid "" "There is no detailed status information available for this storage engine." -msgstr "没有该存储引擎的详细信息。" +msgstr "没有该存储引擎的详细状态信息。" #: libraries/StorageEngine.class.php:352 libraries/structure.lib.php:200 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "%s 是此 MySQL 服务器的默认存储引擎。" +msgstr "%s 是该 MySQL 服务器的默认存储引擎。" #: libraries/StorageEngine.class.php:355 #, php-format msgid "%s is available on this MySQL server." -msgstr "%s 在此 MySQL 服务器上可用。" +msgstr "%s 在该 MySQL 服务器上可用。" #: libraries/StorageEngine.class.php:358 #, php-format msgid "%s has been disabled for this MySQL server." -msgstr "%s 在此 MySQL 服务器上被禁止了。" +msgstr "%s 在该 MySQL 服务器上被禁止了。" #: libraries/StorageEngine.class.php:362 #, php-format msgid "This MySQL server does not support the %s storage engine." -msgstr "此 MySQL 服务器不支持 %s 存储引擎。" +msgstr "该 MySQL 服务器不支持 %s 存储引擎。" #: libraries/Table.class.php:395 msgid "unknown table status: " -msgstr "未知表状态: " +msgstr "未知表状态： " #: libraries/Table.class.php:796 #, php-format msgid "Source database `%s` was not found!" -msgstr "源数据库 `%s` 未找到!" +msgstr "未找到源数据库 `%s`！" #: libraries/Table.class.php:804 #, php-format msgid "Target database `%s` was not found!" -msgstr "未找到目标数据库 %s ！" +msgstr "未找到目标数据库 `%s`！" #: libraries/Table.class.php:1232 msgid "Invalid database" -msgstr "无效的数据库" +msgstr "数据库无效" #: libraries/Table.class.php:1246 tbl_get_field.php:44 msgid "Invalid table name" -msgstr "无效的数据表名" +msgstr "表名无效" #: libraries/Table.class.php:1278 #, php-format @@ -3053,7 +3056,7 @@ msgstr "将表 %1$s 改名为 %2$s 时发生错误" #: libraries/Table.class.php:1297 #, php-format msgid "Table %1$s has been renamed to %2$s." -msgstr "已将数据表 %1$s 改名为 %2$s。" +msgstr "已将表 %1$s 改名为 %2$s。" #: libraries/Table.class.php:1441 msgid "Could not save table UI preferences" @@ -3064,8 +3067,7 @@ msgstr "无法保存表界面设置" msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" -msgstr "" -"清除表用户界面设置失败（查看$cfg['Servers'][$i]['MaxTableUiprefs'] %s）" +msgstr "清除表界面设置失败（参见 $cfg['Servers'][$i]['MaxTableUiprefs'] %s）" #: libraries/Table.class.php:1603 #, php-format @@ -6066,7 +6068,7 @@ msgstr "可能的深度递归攻击" msgid "" "The server is not responding (or the local server's socket is not correctly " "configured)." -msgstr "服务器无响应(或者本地 MySQL 服务器的套接字没有正确配置)。" +msgstr "服务器没有响应（或本地服务器的套接字没有正确设置）。" #: libraries/database_interface.lib.php:2079 msgid "The server is not responding." @@ -6074,7 +6076,7 @@ msgstr "服务器没有响应。" #: libraries/database_interface.lib.php:2084 msgid "Please check privileges of directory containing database." -msgstr "请检查数据库目录的权限。" +msgstr "请检查数据库文件夹的权限。" #: libraries/database_interface.lib.php:2094 msgid "Details…" @@ -6197,7 +6199,7 @@ msgstr "转储部分记录" #: libraries/display_export.lib.php:165 msgid "Number of rows:" -msgstr "记录数：" +msgstr "行数：" #: libraries/display_export.lib.php:177 msgid "Row to begin at:" From 8146d74c088e9c329ba9895c9baedb49331d99d0 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 25 Aug 2013 18:36:32 +0530 Subject: [PATCH 06/15] set to view should not hide the database name --- js/navigation.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index a17c8213ff..21ccb0ccfd 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -172,7 +172,7 @@ function PMA_expandNavigationTree($expandElem) { $icon.removeClass('ic_b_plus').addClass('ic_b_minus'); $children.show('fast'); $('#pma_navigation').animate({ - scrollTop: $children.offset().top + scrollTop: $expandElem.closest('li').offset().top }); } else { $icon.removeClass('ic_b_minus').addClass('ic_b_plus'); @@ -215,7 +215,7 @@ function PMA_expandNavigationTree($expandElem) { .click(); } $('#pma_navigation').animate({ - scrollTop: $destination.children('div.list_container').offset().top + scrollTop: $expandElem.closest('li').offset().top }); } else { PMA_ajaxShowMessage(data.error, false); From f0b063400cc100d9f3ed16a949e6950bf46ba81e Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 25 Aug 2013 18:45:11 +0530 Subject: [PATCH 07/15] fix autoexpand on use query --- js/sql.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/sql.js b/js/sql.js index 4866e6f98b..90942aa7f5 100644 --- a/js/sql.js +++ b/js/sql.js @@ -296,6 +296,7 @@ AJAX.registerOnload('sql.js', function() { } else if (typeof data.reload != 'undefined') { // this happens if a USE or DROP command was typed PMA_commonActions.setDb(data.db); + PMA_reloadNavigation(); PMA_commonActions.refreshMain(false, function () { if ($('#result_query').length) { $('#result_query').remove(); @@ -306,7 +307,6 @@ AJAX.registerOnload('sql.js', function() { .prependTo('#page_content'); } }); - PMA_reloadNavigation(); } $sqlqueryresults.show().trigger('makegrid'); From 73c3cd906e484c75f19039bd4086daa3fd62b8fa Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 25 Aug 2013 22:55:43 +0530 Subject: [PATCH 08/15] Fast-filter box, recent-tables and page-selector should be visible while scrolling navigation, (it eliminates the need to scroll up to find datatbase/recent-table) --- js/navigation.js | 4 ++-- libraries/navigation/NavigationTree.class.php | 2 +- themes/original/css/navigation.css.php | 11 ++++++++++- themes/pmahomme/css/navigation.css.php | 11 ++++++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 21ccb0ccfd..c56d2a2465 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -171,7 +171,7 @@ function PMA_expandNavigationTree($expandElem) { if ($icon.is('.ic_b_plus')) { $icon.removeClass('ic_b_plus').addClass('ic_b_minus'); $children.show('fast'); - $('#pma_navigation').animate({ + $('#pma_navigation_tree_content').animate({ scrollTop: $expandElem.closest('li').offset().top }); } else { @@ -214,7 +214,7 @@ function PMA_expandNavigationTree($expandElem) { .find('a.expander.container') .click(); } - $('#pma_navigation').animate({ + $('#pma_navigation_tree_content').animate({ scrollTop: $expandElem.closest('li').offset().top }); } else { diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index 388e85405a..98cdcb8370 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -639,7 +639,7 @@ class PMA_NavigationTree $retval = $this->_fastFilterHtml($this->_tree); $retval .= $this->_getPageSelector($this->_tree); $this->groupTree(); - $retval .= "
    "; + $retval .= "
      "; $children = $this->_tree->children; usort($children, array('PMA_NavigationTree', 'sortNode')); $this->_setVisibility(); diff --git a/themes/original/css/navigation.css.php b/themes/original/css/navigation.css.php index 7db6fb8f19..1d8645b261 100644 --- a/themes/original/css/navigation.css.php +++ b/themes/original/css/navigation.css.php @@ -21,7 +21,6 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { color: ; width: px; overflow: hidden; - overflow-y: auto; position: fixed; top: 0; : 0; @@ -32,6 +31,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { #pma_navigation_content { width: 100%; + height: 100%; position: absolute; top: 0; : 0; @@ -108,6 +108,15 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { margin: 0.5em 0 0; margin-: 1em; color: #444; + height: 74%; + position: relative; +} +#pma_navigation_tree_content { + width: 100%; + overflow: hidden; + overflow-y: auto; + position: absolute; + height: 100%; } #pma_navigation_tree a { color: ; diff --git a/themes/pmahomme/css/navigation.css.php b/themes/pmahomme/css/navigation.css.php index a853c47924..790941f067 100644 --- a/themes/pmahomme/css/navigation.css.php +++ b/themes/pmahomme/css/navigation.css.php @@ -19,7 +19,6 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { #pma_navigation { width: px; overflow: hidden; - overflow-y: auto; position: fixed; top: 0; : 0; @@ -31,6 +30,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { #pma_navigation_content { width: 100%; + height: 100%; position: absolute; top: 0; : 0; @@ -93,6 +93,15 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { margin: 5px 0 0; margin-: 10px; color: #444; + height: 74%; /*it needs to be dynamically set*/ + position: relative; +} +#pma_navigation_tree_content { + width: 100%; + overflow: hidden; + overflow-y: auto; + position: absolute; + height: 100%; } #pma_navigation_tree a { color: ; From 28041ddb80b996ec8b7a66564269cb7ee578f21c Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 25 Aug 2013 22:56:37 +0530 Subject: [PATCH 09/15] Hide throbber when not in use to free some area --- js/navigation.js | 10 ++++++++-- themes/pmahomme/css/navigation.css.php | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index c56d2a2465..880929d1c6 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -259,7 +259,10 @@ function PMA_autoExpandDatabaseInUse($oldDb, $newDb) { function PMA_reloadNavigation(callback) { var $throbber = $('#pma_navigation .throbber') .first() - .css('visibility', 'visible'); + .css({ + 'visibility' : 'visible', + 'display' : 'block' + }); var params = { reload: true, pos: $('#pma_navigation_tree').find('a.expander:first > span.pos').text() @@ -302,7 +305,10 @@ function PMA_reloadNavigation(callback) { }); var url = $('#pma_navigation').find('a.navigation_url').attr('href'); $.post(url, params, function (data) { - $throbber.css('visibility', 'hidden'); + $throbber.css('visibility', 'hidden').css({ + 'visibility' : 'hidden', + 'display' : 'none' + }); if (data.success) { $('#pma_navigation_tree').html(data.message).children('div').show(); // Fire the callback, if any diff --git a/themes/pmahomme/css/navigation.css.php b/themes/pmahomme/css/navigation.css.php index 790941f067..48d8ee6228 100644 --- a/themes/pmahomme/css/navigation.css.php +++ b/themes/pmahomme/css/navigation.css.php @@ -84,7 +84,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { } #pma_navigation_content > img.throbber { - display: block; + display: none; margin: .3em auto 0; } From a865344279f3977c3ae5d46775f39953bea48f16 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Mon, 26 Aug 2013 08:51:52 +0530 Subject: [PATCH 10/15] fix autoscroll, to set to view the currently selected database --- js/navigation.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 880929d1c6..f8f8aff2b7 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -171,9 +171,6 @@ function PMA_expandNavigationTree($expandElem) { if ($icon.is('.ic_b_plus')) { $icon.removeClass('ic_b_plus').addClass('ic_b_minus'); $children.show('fast'); - $('#pma_navigation_tree_content').animate({ - scrollTop: $expandElem.closest('li').offset().top - }); } else { $icon.removeClass('ic_b_minus').addClass('ic_b_plus'); $children.hide('fast'); @@ -214,9 +211,6 @@ function PMA_expandNavigationTree($expandElem) { .find('a.expander.container') .click(); } - $('#pma_navigation_tree_content').animate({ - scrollTop: $expandElem.closest('li').offset().top - }); } else { PMA_ajaxShowMessage(data.error, false); } @@ -227,6 +221,13 @@ function PMA_expandNavigationTree($expandElem) { $expandElem.blur(); } +function scrollToView($element, $container) { + var pushToOffset = $element.offset().top - $container.offset().top + $container.scrollTop(); + $('#pma_navigation_tree_content').stop().animate({ + scrollTop: pushToOffset + }); +} + /* * Auto-expands the newly chosen database * @@ -246,8 +247,12 @@ function PMA_autoExpandDatabaseInUse($oldDb, $newDb) { $expandElem = $('#pma_navigation_tree a.dbLink:contains("' + $newDb + '")') .parent().find('a.expander').eq(0); $icon = $expandElem.find('img'); - if ($icon.is('.ic_b_plus')) + if ($icon.is('.ic_b_plus')) { PMA_expandNavigationTree($expandElem); + setTimeout(function() { + scrollToView($expandElem.closest('li'), $('#pma_navigation_tree_content')); + }, 120); + } } /** From 32f4c5568c308eb2b5e4429b128f474c3afc7368 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 26 Aug 2013 06:20:06 -0400 Subject: [PATCH 11/15] Directly use request parameter --- browse_foreigners.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index ee35f79e8e..946c1ce2f2 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -13,8 +13,7 @@ require_once 'libraries/transformations.lib.php'; * Sets globals from $_REQUEST */ $request_params = array( - 'field', - 'fieldkey' + 'field' ); foreach ($request_params as $one_request_param) { @@ -117,8 +116,10 @@ $error = PMA_jsFormat( ); -if (! isset($fieldkey) || ! is_numeric($fieldkey)) { +if (! isset($_REQUEST['fieldkey']) || ! is_numeric($_REQUEST['fieldkey'])) { $fieldkey = 0; +} else { + $fieldkey = $_REQUEST['fieldkey']; } $code = << Date: Mon, 26 Aug 2013 17:12:57 +0530 Subject: [PATCH 12/15] fix some logic related to auto-expand/scroll --- js/navigation.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/navigation.js b/js/navigation.js index f8f8aff2b7..ea463bd0c2 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -249,9 +249,11 @@ function PMA_autoExpandDatabaseInUse($oldDb, $newDb) { $icon = $expandElem.find('img'); if ($icon.is('.ic_b_plus')) { PMA_expandNavigationTree($expandElem); + } + if ($oldDb !== $newDb) { setTimeout(function() { scrollToView($expandElem.closest('li'), $('#pma_navigation_tree_content')); - }, 120); + }, 150); } } From e1740a08337cad4795da0c07dd90d851b77cfd4c Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Mon, 26 Aug 2013 17:23:40 +0530 Subject: [PATCH 13/15] missing docs --- js/navigation.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index ea463bd0c2..e0336ef042 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -221,6 +221,13 @@ function PMA_expandNavigationTree($expandElem) { $expandElem.blur(); } +/* + * Auto-scrolls the newly chosen database + * + * @param object $element The element to set to view + * @param object $container The container srollable element + * + */ function scrollToView($element, $container) { var pushToOffset = $element.offset().top - $container.offset().top + $container.scrollTop(); $('#pma_navigation_tree_content').stop().animate({ @@ -231,12 +238,13 @@ function scrollToView($element, $container) { /* * Auto-expands the newly chosen database * - * @param string $oldDb - * @param string $newDb + * @param string $oldDb The previous database + * @param string $newDb The newly chosen database * */ function PMA_autoExpandDatabaseInUse($oldDb, $newDb) { var $expandElem, $icon; + //Collapse the previous database if($oldDb !== '' && $oldDb !== $newDb) { $expandElem = $('#pma_navigation_tree a.dbLink:contains("' + $oldDb + '")') .parent().find('a.expander').eq(0); @@ -244,12 +252,14 @@ function PMA_autoExpandDatabaseInUse($oldDb, $newDb) { if ($icon.is('.ic_b_minus')) PMA_expandNavigationTree($expandElem); } + //expand the newly chosen database $expandElem = $('#pma_navigation_tree a.dbLink:contains("' + $newDb + '")') .parent().find('a.expander').eq(0); $icon = $expandElem.find('img'); if ($icon.is('.ic_b_plus')) { PMA_expandNavigationTree($expandElem); } + //scroll to new database if ($oldDb !== $newDb) { setTimeout(function() { scrollToView($expandElem.closest('li'), $('#pma_navigation_tree_content')); From e422b13b083aa2684dfbf1b0ca6ad1d88b110324 Mon Sep 17 00:00:00 2001 From: shanyan baishui Date: Mon, 26 Aug 2013 05:48:29 +0200 Subject: [PATCH 14/15] Translated using Weblate (Simplified Chinese) Currently translated at 99.0% (2582 of 2609) --- po/zh_CN.po | 164 ++++++++++++++++++++++++---------------------------- 1 file changed, 75 insertions(+), 89 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index c11a95d96c..c00d84cf15 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-25 12:52+0200\n" +"PO-Revision-Date: 2013-08-26 05:48+0200\n" "Last-Translator: shanyan baishui \n" "Language-Team: Simplified Chinese " "\n" @@ -3075,8 +3075,7 @@ msgid "" "Cannot save UI property \"%s\". The changes made will not be persistent " "after you refresh this page. Please check if the table structure has been " "changed." -msgstr "" -"无法保存用户界面属性 \"%s\"。修改将在刷新本页后丢失。请检查表结构是否已修改。" +msgstr "无法保存用户界面属性“%s”。修改将在刷新本页后丢失。请检查表结构是否已修改。" #: libraries/TableSearch.class.php:179 libraries/insert_edit.lib.php:209 #: libraries/insert_edit.lib.php:215 libraries/rte/rte_routines.lib.php:1579 @@ -3107,11 +3106,11 @@ msgstr "编辑/插入" #: libraries/TableSearch.class.php:761 msgid "Select columns (at least one):" -msgstr "选择字段 (至少一个)：" +msgstr "选择字段（至少一个）：" #: libraries/TableSearch.class.php:781 msgid "Add search conditions (body of the \"where\" clause):" -msgstr "添加搜索条件 (“where”语句的主体)：" +msgstr "添加搜索条件（“where”从句的主体）：" #: libraries/TableSearch.class.php:793 msgid "Number of rows per page" @@ -3127,10 +3126,11 @@ msgstr "使用该字段标记每个点" #: libraries/TableSearch.class.php:860 msgid "Maximum rows to plot" -msgstr "显示的最多行数" +msgstr "图表中的最大行数" #: libraries/TableSearch.class.php:888 libraries/TableSearch.class.php:1160 #: sql.php:159 tbl_change.php:230 +#, fuzzy msgid "Browse foreign values" msgstr "浏览不相关的值" @@ -3140,11 +3140,11 @@ msgstr "附加搜索条件" #: libraries/TableSearch.class.php:1115 msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" -msgstr "在两个不同的字段中执行 “依例查询” (通配符：“%”)" +msgstr "在两个不同的字段中执行“依例查询”（通配符：“%”）" #: libraries/TableSearch.class.php:1125 msgid "Do a \"query by example\" (wildcard: \"%\")" -msgstr "执行“依例查询”(通配符：“%”)" +msgstr "执行“依例查询”（通配符：“%”）" #: libraries/TableSearch.class.php:1169 msgid "Browse/Edit the points" @@ -3161,7 +3161,7 @@ msgstr "重置缩放" #: libraries/Theme.class.php:170 #, php-format msgid "No valid image path for theme %s found!" -msgstr "找不到主题 %s 对应的图片路径！" +msgstr "找不到主题 %s 的有效图片路径！" #: libraries/Theme.class.php:459 msgid "No preview available." @@ -3174,12 +3174,12 @@ msgstr "确定" #: libraries/Theme_Manager.class.php:137 #, php-format msgid "Default theme %s not found!" -msgstr "未找到默认主题 %s ！" +msgstr "未找到默认主题 %s！" #: libraries/Theme_Manager.class.php:194 #, php-format msgid "Theme %s not found!" -msgstr "未找到主题 %s ！" +msgstr "未找到主题 %s！" #: libraries/Theme_Manager.class.php:271 #, php-format @@ -3193,22 +3193,19 @@ msgstr "主题" #: libraries/Types.class.php:296 msgid "" "A 1-byte integer, signed range is -128 to 127, unsigned range is 0 to 255" -msgstr "1比特的整数，有符号的表示范围是-128到127,无符号的表示范围是0到255" +msgstr "1 字节整数，有符号范围从 -128 到 127，无符号范围从 0 到 255" #: libraries/Types.class.php:298 msgid "" "A 2-byte integer, signed range is -32,768 to 32,767, unsigned range is 0 to " "65,535" -msgstr "" -"2比特的整数，有符号的表示范围是-32768到32767,无符号的表示范围是0到65535" +msgstr "2 字节整数，有符号范围从 -32768 到 32767，无符号范围从 0 到 65535" #: libraries/Types.class.php:300 msgid "" "A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is " "0 to 16,777,215" -msgstr "" -"3比特的整数，有符号的表示范围是-8388608到8388607,无符号的表示范围是0到" -"16777215" +msgstr "3 字节整数，有符号范围从 -8388608 到 8388607，无符号范围从 0 到 16777215" #: libraries/Types.class.php:302 msgid "" @@ -3223,24 +3220,22 @@ msgid "" "An 8-byte integer, signed range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615" msgstr "" -"8比特的整数，有符号的表示范围是-9223372036854775808到9223372036854775807,无符" -"号的表示范围是0到18446744073709551615" +"8 字节整数，有符号范围从 -9223372036854775808 到 9223372036854775807，无符号范围从 0 到 " +"18446744073709551615" #: libraries/Types.class.php:306 libraries/Types.class.php:712 msgid "" "A fixed-point number (M, D) - the maximum number of digits (M) is 65 " "(default 10), the maximum number of decimals (D) is 30 (default 0)" -msgstr "" -"一个定点数值 (M, D)-数字(M)的最大值是65（默认值是10），十进制数字(D)的最大值" -"是30（默认值是0）" +msgstr "定点数（M，D）- 整数部分（M）最大为 65（默认 10），小数部分（D）最大为 30（默认 0）" #: libraries/Types.class.php:308 msgid "" "A small floating-point number, allowable values are -3.402823466E+38 to " "-1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38" msgstr "" -"小型浮点数，允许值可以是在-3.402823466E+38和-1.175494351E-38之间，或者是 0，" -"或者在 1.175494351E-38 到 3.402823466E+38之间" +"单精度浮点数，取值范围从 -3.402823466E+38 到 -1.175494351E-38、0 以及从 1.175494351E-38 到 " +"3.402823466E+38" #: libraries/Types.class.php:310 msgid "" @@ -3248,162 +3243,155 @@ msgid "" "-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and " "2.2250738585072014E-308 to 1.7976931348623157E+308" msgstr "" -"双精度浮点数，允许的值为-1.7976931348623157E+308 到 " -"-2.2250738585072014E-308, 0, 以及 2.2250738585072014E-308 到 " -"1.7976931348623157E+308" +"双精度浮点数，取值范围从 -1.7976931348623157E+308 到 -2.2250738585072014E-308、0 以及从 " +"2.2250738585072014E-308 到 1.7976931348623157E+308" #: libraries/Types.class.php:312 msgid "" "Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for " "FLOAT)" -msgstr "DOUBLE 的别名（除了在 REAL_AS_FLOAT SQL 模式下它是 FLOAT类型的别名）" +msgstr "DOUBLE 的别名（例外：REAL_AS_FLOAT SQL 模式时它是 FLOAT 的别名）" #: libraries/Types.class.php:314 msgid "" "A bit-field type (M), storing M of bits per value (default is 1, maximum is " "64)" -msgstr "一个位域类型（M），每个值保存M位（默认是1，最大为64）" +msgstr "位类型（M），每个值存储 M 位（默认为 1，最大为 64）" #: libraries/Types.class.php:316 msgid "" "A synonym for TINYINT(1), a value of zero is considered false, nonzero " "values are considered true" -msgstr "TINYINT(1) 的一个别名，值为0时表示 false，不为零是表示 true" +msgstr "TINYINT(1) 的别名，零值表示假，非零值表示真" #: libraries/Types.class.php:318 msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE 的别称" +msgstr "BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE 的别名" #: libraries/Types.class.php:320 libraries/Types.class.php:722 #, php-format msgid "A date, supported range is %1$s to %2$s" -msgstr "从 %1$s 到 %2$s 之间的一个日期" +msgstr "日期，支持的范围从 %1$s 到 %2$s" #: libraries/Types.class.php:322 libraries/Types.class.php:724 #, php-format msgid "A date and time combination, supported range is %1$s to %2$s" -msgstr "日期与时间的结合，支持的范围是从 %1$s 到 %2$s" +msgstr "日期与时间，支持的范围从 %1$s 到 %2$s" #: libraries/Types.class.php:324 msgid "" "A timestamp, range is 1970-01-01 00:00:01 UTC to 2038-01-09 03:14:07 UTC, " "stored as the number of seconds since the epoch (1970-01-01 00:00:00 UTC)" msgstr "" -"时间戳，支持的范围是从1970-01-01 00:00:01 UTC 到 2038-01-09 03:14:07 UTC，存" -"储从公元1970-01-01 00:00:00 UTC以来的秒数" +"时间戳，范围从 1970-01-01 00:00:01 UTC 到 2038-01-09 03:14:07 UTC，存储为自纪元（1970-01-01 " +"00:00:00 UTC）起的秒数" #: libraries/Types.class.php:326 libraries/Types.class.php:728 #, php-format msgid "A time, range is %1$s to %2$s" -msgstr "从 %1$s 到 %2$s 之间的一个时间" +msgstr "时间，范围从 %1$s 到 %2$s" #: libraries/Types.class.php:328 msgid "" "A year in four-digit (4, default) or two-digit (2) format, the allowable " "values are 70 (1970) to 69 (2069) or 1901 to 2155 and 0000" -msgstr "" -"四位数（默认）或者两位数的年份，允许的值是70（1970）到69（2069）或者是1901到" -"2155和0000" +msgstr "四位数（4，默认）或两位数（2）的年份，取值范围从 70（1970）到 69（2069）或从 1901 到 2155 以及 0000" #: libraries/Types.class.php:330 msgid "" "A fixed-length (0-255, default 1) string that is always right-padded with " "spaces to the specified length when stored" -msgstr "始终会在最后部分用空格填充不足部分的定长字符串（0-255,默认长度为1）" +msgstr "定长（0-255，默认 1）字符串，存储时会向右边补足空格到指定长度" #: libraries/Types.class.php:332 libraries/Types.class.php:730 #, php-format msgid "" "A variable-length (%s) string, the effective maximum length is subject to " "the maximum row size" -msgstr "可变长（%s）字符串，实际可用最长长度由最长字段长度定义" +msgstr "变长（%s）字符串，最大有效长度取决于最大行大小" #: libraries/Types.class.php:334 msgid "" "A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with " "a one-byte prefix indicating the length of the value in bytes" -msgstr "" -"一个最长255字符的TEXT字段，并采用一个前缀（一个字节长）来表示当前值的字节长度" +msgstr "最多存储 255（2^8 - 1）字节的文本字段，存储时在内容前使用 1 字节表示内容的字节数" #: libraries/Types.class.php:336 libraries/Types.class.php:732 msgid "" "A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored " "with a two-byte prefix indicating the length of the value in bytes" -msgstr "" -"一个最长65536字符的TEXT字段，采用一个前缀（两个字节）表示当前值的字节长度" +msgstr "最多存储 65535（2^16 - 1）字节的文本字段，存储时在内容前使用 2 字节表示内容的字节数" #: libraries/Types.class.php:338 msgid "" "A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, " "stored with a three-byte prefix indicating the length of the value in bytes" -msgstr "一个最长16777215字节的TEXT字段，在字节开始处用三个字节保存当前值的长度" +msgstr "最多存储 16777215（2^24 - 1）字节的文本字段，存储时在内容前使用 3 字节表示内容的字节数" #: libraries/Types.class.php:340 msgid "" "A TEXT column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " "characters, stored with a four-byte prefix indicating the length of the " "value in bytes" -msgstr "" -"一个最长4294967295字节的TEXT字段，在字节开始处用四个字节保存当前值的长度" +msgstr "最多存储 4294967295 字节即 4GB（2^32 - 1）的文本字段，存储时在内容前使用 4 字节表示内容的字节数" #: libraries/Types.class.php:342 msgid "" "Similar to the CHAR type, but stores binary byte strings rather than non-" "binary character strings" -msgstr "和CHAR类型相似，但是存储二进制字符串而不是非二进制字符串" +msgstr "类似于 CHAR 类型，但其存储的是二进制字节串而不是非二进制字符串" #: libraries/Types.class.php:344 msgid "" "Similar to the VARCHAR type, but stores binary byte strings rather than non-" "binary character strings" -msgstr "和VARCHAR类型相似，但是存储二进制字符串而不是非二进制字符串" +msgstr "类似于 VARCHAR 类型，但其存储的是二进制字节串而不是非二进制字符串" #: libraries/Types.class.php:346 msgid "" "A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a " "one-byte prefix indicating the length of the value" -msgstr "一个最长255字节的BLOB字段，在字节开始处用一个字节保存当前值的长度" +msgstr "最多存储 255（2^8 - 1）字节的 BLOB 字段，存储时在内容前使用 1 字节表示内容的字节数" #: libraries/Types.class.php:348 msgid "" "A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored " "with a three-byte prefix indicating the length of the value" -msgstr "一个最长16777215字节的BOLB字段，在字节开始处用三个字节保存当前值的长度" +msgstr "最多存储 16777215（2^24 - 1）字节的 BLOB 字段，存储时在内容前使用 3 字节表示内容的字节数" #: libraries/Types.class.php:350 libraries/Types.class.php:736 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a two-byte prefix indicating the length of the value" -msgstr "一个最长65535字节的BLOB字段，在字节开始处用两个字节保存当前值的长度" +msgstr "最多存储 65535（2^16 - 1）字节的 BLOB 字段，存储时在内容前使用 2 字节表示内容的字节数" #: libraries/Types.class.php:352 msgid "" "A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " "bytes, stored with a four-byte prefix indicating the length of the value" -msgstr "" -"一个最长4294967295/4Gb字节的BLOB字段，在字节开始处用四个字节保存当前值的长度" +msgstr "最多存储 4294967295 字节即 4GB（2^32 - 1）的 BLOB 字段，存储时在内容前使用 4 字节表示内容的字节数" #: libraries/Types.class.php:354 msgid "" "An enumeration, chosen from the list of up to 65,535 values or the special " "'' error value" -msgstr "枚举类型，可从多达65535个值的列表中选择，或者是特殊的''错误代码" +msgstr "枚举，可从最多 65535 个值的列表中选择或特殊的错误值 ''" #: libraries/Types.class.php:356 msgid "A single value chosen from a set of up to 64 members" -msgstr "从一组最多64个成员的集合中选择的单个值" +msgstr "可从最多 64 个成员中选择集合为一个值" #: libraries/Types.class.php:358 msgid "A type that can store a geometry of any type" -msgstr "一个能存储任何几何形状的类型" +msgstr "一种能存储任意类型几何体的类型" #: libraries/Types.class.php:360 msgid "A point in 2-dimensional space" -msgstr "二维空间的点" +msgstr "二维空间中的点" #: libraries/Types.class.php:362 msgid "A curve with linear interpolation between points" -msgstr "一条点与点之间线性插值的曲线" +msgstr "点之间的线性插值曲线" #: libraries/Types.class.php:364 msgid "A polygon" @@ -3411,24 +3399,24 @@ msgstr "多边形" #: libraries/Types.class.php:366 msgid "A collection of points" -msgstr "点集合" +msgstr "点的集合" #: libraries/Types.class.php:368 msgid "A collection of curves with linear interpolation between points" -msgstr "一个点与点之间线性插值的曲线集合" +msgstr "点之间的线性插值曲线的集合" #: libraries/Types.class.php:370 msgid "A collection of polygons" -msgstr "一个多边形集合" +msgstr "多边形的集合" #: libraries/Types.class.php:372 msgid "A collection of geometry objects of any type" -msgstr "一个任何类型几何对象的集合" +msgstr "任意类型几何体对象的集合" #: libraries/Types.class.php:624 libraries/Types.class.php:974 msgctxt "numeric types" msgid "Numeric" -msgstr "数字的" +msgstr "数字" #: libraries/Types.class.php:643 libraries/Types.class.php:977 msgctxt "date and time types" @@ -3438,7 +3426,7 @@ msgstr "日期与时间" #: libraries/Types.class.php:652 libraries/Types.class.php:980 msgctxt "string types" msgid "String" -msgstr "字符串" +msgstr "文本" #: libraries/Types.class.php:673 msgctxt "spatial types" @@ -3447,49 +3435,47 @@ msgstr "空间" #: libraries/Types.class.php:708 msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647" -msgstr "4字节的整形，取值范围是-2,147,483,648 到 2,147,483,647" +msgstr "4 字节整数，范围从 -2147483648 到 2147483647" #: libraries/Types.class.php:710 msgid "" "An 8-byte integer, range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807" -msgstr "" -"8字节的整形，取值范围是 -9,223,372,036,854,775,808 到 " -"9,223,372,036,854,775,807\t" +msgstr "8 字节整数，范围从 -9223372036854775808 到 9223372036854775807" #: libraries/Types.class.php:714 msgid "A system's default double-precision floating-point number" -msgstr "系统默认的双精度浮点型" +msgstr "系统默认的双精度浮点数" #: libraries/Types.class.php:716 msgid "True or false" -msgstr "true 或者 false" +msgstr "真或假" #: libraries/Types.class.php:718 msgid "An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "BIGINT NOT NULL AUTO_INCREMENT UNIQUE 的别称" +msgstr "BIGINT NOT NULL AUTO_INCREMENT UNIQUE 的别名" #: libraries/Types.class.php:720 msgid "Stores a Universally Unique Identifier (UUID)" -msgstr "保存全局唯一标识符 （UUID）" +msgstr "存储一个通用唯一识别码（UUID）" #: libraries/Types.class.php:726 msgid "" "A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' " "UTC; TIMESTAMP(6) can store microseconds" msgstr "" -"时间戳，取值范围从 '0001-01-01 00:00:00' UTC 到 '9999-12-31 23:59:59' UTC; " -"TIMESTAMP(6) 可以保存到微秒" +"时间戳，范围从‘0001-01-01 00:00:00’UTC 到‘9999-12-31 23:59:59’UTC；TIMESTAMP(6) " +"可以存储微秒" #: libraries/Types.class.php:734 msgid "" "A variable-length (0-65,535) string, uses binary collation for all " "comparisons" -msgstr "一个长度不定（0-65,535）的字符串，对所有对比采用二进制排序规则" +msgstr "变长（0-65535）字符串，使用二进制排序规则进行所有比较" #: libraries/Types.class.php:738 msgid "An enumeration, chosen from the list of defined values" -msgstr "在已定义值列表中取值的枚举类型" +msgstr "枚举，从定义好的值中选择" #: libraries/Util.class.php:237 #, php-format @@ -3507,7 +3493,7 @@ msgstr "最大限制：%s %s" #: libraries/rte/rte_triggers.lib.php:112 #: libraries/rte/rte_triggers.lib.php:133 msgid "MySQL said: " -msgstr "MySQL 返回: " +msgstr "MySQL 返回： " #: libraries/Util.class.php:1182 msgid "Failed to connect to SQL validator!" @@ -3565,7 +3551,7 @@ msgstr "周日" #: libraries/Util.class.php:1725 #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:69 msgid "%B %d, %Y at %I:%M %p" -msgstr "%Y 年 %m 月 %d 日 %H:%M" +msgstr "%Y-%m-%d %H:%M:%S" #: libraries/Util.class.php:2070 #, php-format @@ -3574,17 +3560,17 @@ msgstr "%s 天 %s 小时，%s 分 %s 秒" #: libraries/Util.class.php:2159 msgid "Missing parameter:" -msgstr "缺少参数:" +msgstr "缺少参数：" #: libraries/Util.class.php:2686 #, php-format msgid "Jump to database "%s"." -msgstr "跳转到数据库“%s”。" +msgstr "转到数据库 "%s"。" #: libraries/Util.class.php:2710 #, php-format msgid "The %s functionality is affected by a known bug, see %s" -msgstr "%s 功能受到一个已知的缺陷 (bug) 影响，参见 %s" +msgstr "功能 %s 受到一个已知缺陷的影响，参见 %s" #: libraries/Util.class.php:2886 msgid "Click to toggle" @@ -3660,7 +3646,7 @@ msgstr "已复制" #: libraries/build_html_for_db.lib.php:170 #, php-format msgid "Check privileges for database "%s"." -msgstr "检查数据库“%s”的权限。" +msgstr "检查数据库 "%s" 的权限。" #: libraries/build_html_for_db.lib.php:175 msgid "Check Privileges" @@ -3679,23 +3665,23 @@ msgstr "这通常意味着文件中有语法错误，请检查下面显示出的 #: libraries/common.inc.php:608 #, php-format msgid "Could not load default configuration from: %1$s" -msgstr "无法加载默认配置: %1$s" +msgstr "无法加载默认设置：%1$s" #: libraries/common.inc.php:615 msgid "" "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your " "configuration file!" -msgstr "必须在您的配置文件中设置 [code]$cfg['PmaAbsoluteUri'][/code] ！" +msgstr "必须在您的配置文件中设置好 [code]$cfg['PmaAbsoluteUri'][/code]！" #: libraries/common.inc.php:648 #, php-format msgid "Invalid server index: %s" -msgstr "无效的服务器索引: %s" +msgstr "无效的服务器索引：%s" #: libraries/common.inc.php:659 #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." -msgstr "无效的主机名 %1$s，请检查配置文件。" +msgstr "服务器 %1$s 的主机名无效。请复查您的设置。" #: libraries/common.inc.php:868 msgid "Invalid authentication method set in configuration:" @@ -3708,7 +3694,7 @@ msgstr "您应升级到 %s %s 或更高版本。" #: libraries/common.inc.php:1079 msgid "Error: Token mismatch" -msgstr "错误：Token不符" +msgstr "错误：令牌不符" #: libraries/common.inc.php:1123 msgid "GLOBALS overwrite attempt" From c2e5b1160d471a87e133ba2af991df6943f5d086 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 26 Aug 2013 09:36:59 -0400 Subject: [PATCH 15/15] ChangeLog entry for rfe 1435 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index feb11bd052..356fd881c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug #4064 Table structure statistics "Space usage" caption too small for l10n - bug #4051 Wrong tabindex when inserting rows - bug #4066 varchar field not truncated in table browse mode ++ rfe #1435 Opening database should expand it in the navigation menu 4.0.5.0 (2013-08-04) - bug #3977 Not detected configuration storage