diff options
| author | phpMyAdmin bot <bot@phpmyadmin.net> | 2021-12-19 03:12:39 +0300 |
|---|---|---|
| committer | phpMyAdmin bot <bot@phpmyadmin.net> | 2021-12-19 03:12:39 +0300 |
| commit | 46d2abd5f0b2dd7bc8dd2b57b6596b191f68efd4 (patch) | |
| tree | 2962f0285606e0ed2eb5ba507910b93175bf9fba /po/zh_CN.po | |
| parent | d2147a48a6fc8ae7156f32fc788681ff53217d11 (diff) | |
Update po files
[ci skip]
Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 1110 |
1 files changed, 617 insertions, 493 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 2b77fd6957..34c08c29e0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 5.2.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2021-12-12 00:11+0000\n" +"POT-Creation-Date: 2021-12-19 00:12+0000\n" "PO-Revision-Date: 2021-08-08 00:09+0000\n" "Last-Translator: popcorner <memoword@163.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" @@ -259,11 +259,17 @@ msgid "Suboptimal caching method." msgstr "最佳缓存模式。" #: libraries/advisory_rules_generic.php:190 +#, fuzzy +#| msgid "" +#| "You are using the MySQL Query cache with a fairly high traffic database. " +#| "It might be worth considering to use <a href=\"https://dev.mysql.com/doc/" +#| "refman/5.6/en/ha-memcached.html\">memcached</a> instead of the MySQL " +#| "Query cache, especially if you have multiple slaves." msgid "" "You are using the MySQL Query cache with a fairly high traffic database. It " "might be worth considering to use <a href=\"https://dev.mysql.com/doc/" "refman/5.6/en/ha-memcached.html\">memcached</a> instead of the MySQL Query " -"cache, especially if you have multiple slaves." +"cache, especially if you have multiple replicas." msgstr "" "您正在一台具有相当高流量的数据库中使用 MySQL 查询缓存。使用 <a href=" "\"https://dev.mysql.com/doc/refman/5.6/en/ha-memcached.html\">memcached</a> " @@ -1212,9 +1218,9 @@ msgstr "搜索：" #: libraries/classes/BrowseForeigners.php:206 #: libraries/classes/Controllers/JavaScriptMessagesController.php:324 #: libraries/classes/Controllers/Server/PrivilegesController.php:330 -#: libraries/classes/Normalization.php:256 -#: libraries/classes/Normalization.php:985 libraries/classes/Tracking.php:327 -#: libraries/classes/Tracking.php:481 +#: libraries/classes/Normalization.php:255 +#: libraries/classes/Normalization.php:984 libraries/classes/Tracking.php:328 +#: libraries/classes/Tracking.php:482 #: templates/columns_definitions/column_definitions_form.twig:43 #: templates/database/designer/main.twig:1102 #: templates/database/events/editor_form.twig:115 @@ -1241,11 +1247,11 @@ msgstr "搜索：" #: templates/server/privileges/privileges_table.twig:858 #: templates/server/privileges/user_properties.twig:149 #: templates/server/privileges/users_overview.twig:159 -#: templates/server/replication/change_master.twig:33 -#: templates/server/replication/master_add_slave_user.twig:81 -#: templates/server/replication/master_configuration.twig:30 -#: templates/server/replication/slave_configuration.twig:16 -#: templates/server/replication/slave_configuration.twig:88 +#: templates/server/replication/change_primary.twig:33 +#: templates/server/replication/primary_add_replica_user.twig:81 +#: templates/server/replication/primary_configuration.twig:30 +#: templates/server/replication/replica_configuration.twig:16 +#: templates/server/replication/replica_configuration.twig:88 #: templates/server/user_groups/edit_user_groups.twig:21 #: templates/sql/query.twig:147 templates/sql/query.twig:198 #: templates/table/find_replace/index.twig:62 @@ -1592,22 +1598,22 @@ msgctxt "Collation" msgid "Vietnamese" msgstr "越南语" -#: libraries/classes/Common.php:241 +#: libraries/classes/Common.php:242 #, php-format msgid "You should upgrade to %s %s or later." msgstr "您应升级到 %s %s 或更高版本。" -#: libraries/classes/Common.php:273 +#: libraries/classes/Common.php:274 msgid "Error: Token mismatch" msgstr "错误：令牌不符" -#: libraries/classes/Common.php:485 +#: libraries/classes/Common.php:488 msgid "" "Failed to set session cookie. Maybe you are using HTTP instead of HTTPS to " "access phpMyAdmin." msgstr "无法设置会话cookie。也许您使用HTTP而不是HTTPS来访问phpMyAdmin。" -#: libraries/classes/Common.php:549 +#: libraries/classes/Common.php:552 msgid "" "You have enabled mbstring.func_overload in your PHP configuration. This " "option is incompatible with phpMyAdmin and might cause some data to be " @@ -1616,17 +1622,17 @@ msgstr "" "您在 PHP 设置中启用了 mbstring.func_overload。该选项和 phpMyAdmin 不兼容并可" "能会导致一些数据损坏！" -#: libraries/classes/Common.php:566 +#: libraries/classes/Common.php:569 msgid "" "The ini_get and/or ini_set functions are disabled in php.ini. phpMyAdmin " "requires these functions!" msgstr "php.ini中禁用了ini_get和/或ini_set函数。 phpMyAdmin需要这些函数！" -#: libraries/classes/Common.php:577 +#: libraries/classes/Common.php:580 msgid "GLOBALS overwrite attempt" msgstr "企图覆盖 GLOBALS" -#: libraries/classes/Common.php:587 +#: libraries/classes/Common.php:590 msgid "possible exploit" msgstr "检测到有利用漏洞的企图" @@ -3206,8 +3212,8 @@ msgid "First day of calendar" msgstr "日历的第一天" #: libraries/classes/Config/Descriptions.php:751 -#: libraries/classes/Config/Descriptions.php:762 libraries/classes/Menu.php:485 -#: libraries/classes/Util.php:1962 libraries/config.values.php:155 +#: libraries/classes/Config/Descriptions.php:762 libraries/classes/Menu.php:486 +#: libraries/classes/Util.php:1963 libraries/config.values.php:155 #: templates/navigation/tree/database_select.twig:10 #: templates/server/databases/index.twig:3 templates/server/export/index.twig:7 #: templates/server/export/index.twig:14 @@ -3321,11 +3327,11 @@ msgstr "高级功能" msgid "Changes tracking" msgstr "追踪变化" -#: libraries/classes/Config/Descriptions.php:778 libraries/classes/Menu.php:257 -#: libraries/classes/Menu.php:364 libraries/classes/Menu.php:490 +#: libraries/classes/Config/Descriptions.php:778 libraries/classes/Menu.php:258 +#: libraries/classes/Menu.php:365 libraries/classes/Menu.php:491 #: libraries/classes/Navigation/Nodes/NodeTable.php:316 -#: libraries/classes/Util.php:1496 libraries/classes/Util.php:1963 -#: libraries/classes/Util.php:1978 libraries/classes/Util.php:1995 +#: libraries/classes/Util.php:1497 libraries/classes/Util.php:1964 +#: libraries/classes/Util.php:1979 libraries/classes/Util.php:1996 #: libraries/config.values.php:62 libraries/config.values.php:76 #: libraries/config.values.php:167 libraries/config.values.php:177 msgid "SQL" @@ -3609,7 +3615,7 @@ msgid "Recently used tables" msgstr "最近使用的表" #: libraries/classes/Config/Descriptions.php:858 -#: libraries/classes/RecentFavoriteTable.php:250 +#: libraries/classes/RecentFavoriteTable.php:252 msgid "Favorite tables" msgstr "表收藏夹" @@ -3974,16 +3980,16 @@ msgid "Skip locked tables" msgstr "跳过锁定的表" #: libraries/classes/Config/Descriptions.php:949 +#: libraries/classes/ConfigStorage/UserGroups.php:129 #: libraries/classes/Controllers/JavaScriptMessagesController.php:388 #: libraries/classes/Display/Results.php:3090 #: libraries/classes/Html/Generator.php:670 #: libraries/classes/Html/Generator.php:927 -#: libraries/classes/Server/UserGroups.php:130 #: templates/console/bookmark_content.twig:7 templates/console/display.twig:31 #: templates/console/display.twig:175 -#: templates/database/central_columns/main.twig:267 -#: templates/database/central_columns/main.twig:380 -#: templates/database/central_columns/main.twig:381 +#: templates/database/central_columns/main.twig:265 +#: templates/database/central_columns/main.twig:376 +#: templates/database/central_columns/main.twig:377 #: templates/database/events/index.twig:74 #: templates/database/events/index.twig:77 #: templates/database/events/row.twig:23 templates/database/events/row.twig:26 @@ -4279,13 +4285,13 @@ msgstr "自定义" #: libraries/classes/Config/Forms/User/ExportForm.php:100 #: libraries/classes/Config/Forms/User/ExportForm.php:128 #: libraries/classes/Controllers/JavaScriptMessagesController.php:702 -#: libraries/classes/Import.php:1324 libraries/classes/Menu.php:249 -#: libraries/classes/Menu.php:359 +#: libraries/classes/Import.php:1324 libraries/classes/Menu.php:250 +#: libraries/classes/Menu.php:360 #: libraries/classes/Navigation/Nodes/NodeColumn.php:42 #: libraries/classes/Navigation/Nodes/NodeDatabase.php:50 #: libraries/classes/Navigation/Nodes/NodeTable.php:307 -#: libraries/classes/Util.php:1495 libraries/classes/Util.php:1977 -#: libraries/classes/Util.php:1994 libraries/config.values.php:60 +#: libraries/classes/Util.php:1496 libraries/classes/Util.php:1978 +#: libraries/classes/Util.php:1995 libraries/config.values.php:60 #: libraries/config.values.php:74 libraries/config.values.php:165 #: libraries/config.values.php:175 #: templates/columns_definitions/table_fields_definitions.twig:4 @@ -4327,10 +4333,10 @@ msgstr "OpenOffice 文档" #: libraries/classes/Config/Forms/User/ExportForm.php:153 #: libraries/classes/Controllers/JavaScriptMessagesController.php:373 -#: libraries/classes/Menu.php:279 libraries/classes/Menu.php:384 -#: libraries/classes/Menu.php:518 libraries/classes/Server/Privileges.php:1538 -#: libraries/classes/Util.php:1966 libraries/classes/Util.php:1981 -#: libraries/classes/Util.php:1998 templates/database/events/index.twig:16 +#: libraries/classes/Menu.php:280 libraries/classes/Menu.php:385 +#: libraries/classes/Menu.php:519 libraries/classes/Server/Privileges.php:1538 +#: libraries/classes/Util.php:1967 libraries/classes/Util.php:1982 +#: libraries/classes/Util.php:1999 templates/database/events/index.twig:16 #: templates/database/events/index.twig:17 #: templates/database/events/index.twig:86 #: templates/database/events/row.twig:36 @@ -4372,9 +4378,9 @@ msgstr "CSV 使用 LOAD DATA" #: libraries/classes/Config/Forms/User/ImportForm.php:67 #: libraries/classes/Controllers/JavaScriptMessagesController.php:310 -#: libraries/classes/Menu.php:288 libraries/classes/Menu.php:394 -#: libraries/classes/Menu.php:523 libraries/classes/Util.php:1967 -#: libraries/classes/Util.php:1982 libraries/classes/Util.php:1999 +#: libraries/classes/Menu.php:289 libraries/classes/Menu.php:395 +#: libraries/classes/Menu.php:524 libraries/classes/Util.php:1968 +#: libraries/classes/Util.php:1983 libraries/classes/Util.php:2000 #: templates/import.twig:3 templates/import.twig:199 #: templates/preferences/header.twig:48 #: templates/preferences/manage/main.twig:11 @@ -4546,6 +4552,40 @@ msgid "" "are unavailable on this system." msgstr "此系统目前不支持 %1$sGZip 压缩和解压缩%2$s所必须的 (%3$s) 函数。" +#: libraries/classes/ConfigStorage/Relation.php:1432 +msgid "no description" +msgstr "无说明" + +#: libraries/classes/ConfigStorage/Relation.php:1634 +#, fuzzy, php-format +#| msgid "" +#| "You do not have necessary privileges to create a database named '%s'. You " +#| "may go to 'Operations' tab of any database to set up the phpMyAdmin " +#| "configuration storage there." +msgid "" +"You do not have necessary privileges to create a database named '%s'. You " +"may go to 'Operations' tab of any database to set up the phpMyAdmin " +"configuration storage there." +msgstr "" +"您没有权限建立名为“phpmyadmin”的数据库。您可能需要到任一数据库的“操作”页面设" +"置 phpMyAdmin的储存位置 。" + +#: libraries/classes/ConfigStorage/UserGroups.php:120 +msgid "View users" +msgstr "查看用户" + +#: libraries/classes/ConfigStorage/UserGroups.php:256 +msgid "Server-level tabs" +msgstr "服务器等级标签" + +#: libraries/classes/ConfigStorage/UserGroups.php:261 +msgid "Database-level tabs" +msgstr "数据库等级标签" + +#: libraries/classes/ConfigStorage/UserGroups.php:266 +msgid "Table-level tabs" +msgstr "表等级标签" + #: libraries/classes/Config/Validator.php:243 msgid "Could not connect to the database server!" msgstr "无法连接到数据库！" @@ -4609,17 +4649,17 @@ msgstr "请输入非负数！" msgid "Value must be less than or equal to %s!" msgstr "值应小于或等于 %s！" -#: libraries/classes/Console.php:90 +#: libraries/classes/Console.php:92 #, php-format msgid "Showing %1$d bookmark (both private and shared)" msgid_plural "Showing %1$d bookmarks (both private and shared)" msgstr[0] "已显示 %1$d 个书签（包括私有和共享）" -#: libraries/classes/Console.php:97 +#: libraries/classes/Console.php:99 msgid "No bookmarks" msgstr "没有书签" -#: libraries/classes/Console.php:129 +#: libraries/classes/Console.php:131 msgid "SQL Query Console" msgstr "SQL 查询控制台" @@ -4666,7 +4706,7 @@ msgid "Could not load import plugins, please check your installation!" msgstr "无法加载导入插件，请检查您的安装！" #: libraries/classes/Controllers/Database/Operations/CollationController.php:48 -#: libraries/classes/Controllers/Table/OperationsController.php:261 +#: libraries/classes/Controllers/Table/OperationsController.php:262 msgid "No collation provided." msgstr "未提供排序规则。" @@ -4774,7 +4814,7 @@ msgstr "未知" #: libraries/classes/Plugins/Export/ExportTexytext.php:622 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:754 #: templates/config/form_display/input.twig:42 -#: templates/database/central_columns/main.twig:360 +#: templates/database/central_columns/main.twig:356 #: templates/database/data_dictionary/index.twig:47 #: templates/database/data_dictionary/index.twig:91 #: templates/database/designer/main.twig:1117 @@ -4805,7 +4845,7 @@ msgstr "是" #: libraries/classes/Controllers/Database/Structure/DropTableController.php:57 #: libraries/classes/Controllers/Database/Structure/EmptyTableController.php:73 #: libraries/classes/Controllers/Table/DropColumnController.php:74 -#: libraries/classes/Controllers/Table/OperationsController.php:321 +#: libraries/classes/Controllers/Table/OperationsController.php:322 #: libraries/classes/Controllers/Table/ReplaceController.php:419 #: libraries/classes/Core.php:723 templates/preview_sql.twig:3 msgid "No change" @@ -5151,8 +5191,10 @@ msgid "Do you really want to remove partitioning?" msgstr "您真的要移除分区吗？" #: libraries/classes/Controllers/JavaScriptMessagesController.php:73 -msgid "Do you really want to RESET SLAVE?" -msgstr "您真的要执行“RESET SLAVE”吗？" +#, fuzzy +#| msgid "Do you really want to revoke the selected user(s) ?" +msgid "Do you really want to reset the replica (RESET REPLICA)?" +msgstr "您真的要删除选择的用户吗？" #: libraries/classes/Controllers/JavaScriptMessagesController.php:75 msgid "" @@ -5322,7 +5364,7 @@ msgid "Removing Selected Users" msgstr "正在删除选中的用户" #: libraries/classes/Controllers/JavaScriptMessagesController.php:137 -#: libraries/classes/Tracking.php:237 libraries/classes/Tracking.php:641 +#: libraries/classes/Tracking.php:238 libraries/classes/Tracking.php:642 #: templates/columns_definitions/column_definitions_form.twig:176 #: templates/columns_definitions/column_definitions_form.twig:181 #: templates/error/report_modal.twig:14 templates/export_modal.twig:6 @@ -5415,13 +5457,13 @@ msgstr "其它" #. l10n: Thousands separator #: libraries/classes/Controllers/JavaScriptMessagesController.php:152 -#: libraries/classes/Util.php:559 libraries/classes/Util.php:591 +#: libraries/classes/Util.php:560 libraries/classes/Util.php:592 msgid "," msgstr "," #. l10n: Decimal separator #: libraries/classes/Controllers/JavaScriptMessagesController.php:154 -#: libraries/classes/Util.php:557 libraries/classes/Util.php:589 +#: libraries/classes/Util.php:558 libraries/classes/Util.php:590 msgid "." msgstr "." @@ -5528,45 +5570,45 @@ msgstr "进程" #. l10n: shortcuts for Byte #: libraries/classes/Controllers/JavaScriptMessagesController.php:193 -#: libraries/classes/Util.php:465 +#: libraries/classes/Util.php:466 msgid "B" msgstr "字节" #. l10n: shortcuts for Kilobyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:194 -#: libraries/classes/Util.php:467 +#: libraries/classes/Util.php:468 #: templates/server/status/monitor/index.twig:186 msgid "KiB" msgstr "KB" #. l10n: shortcuts for Megabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:195 -#: libraries/classes/Util.php:469 +#: libraries/classes/Util.php:470 #: templates/server/status/monitor/index.twig:187 msgid "MiB" msgstr "MB" #. l10n: shortcuts for Gigabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:196 -#: libraries/classes/Util.php:471 +#: libraries/classes/Util.php:472 msgid "GiB" msgstr "GB" #. l10n: shortcuts for Terabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:197 -#: libraries/classes/Util.php:473 +#: libraries/classes/Util.php:474 msgid "TiB" msgstr "TB" #. l10n: shortcuts for Petabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:198 -#: libraries/classes/Util.php:475 +#: libraries/classes/Util.php:476 msgid "PiB" msgstr "PB" #. l10n: shortcuts for Exabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:199 -#: libraries/classes/Util.php:477 +#: libraries/classes/Util.php:478 msgid "EiB" msgstr "EB" @@ -5586,7 +5628,7 @@ msgid "Traffic" msgstr "流量" #: libraries/classes/Controllers/JavaScriptMessagesController.php:205 -#: libraries/classes/Menu.php:528 libraries/classes/Util.php:1968 +#: libraries/classes/Menu.php:529 libraries/classes/Util.php:1969 #: templates/server/status/monitor/index.twig:12 msgid "Settings" msgstr "设置" @@ -5607,7 +5649,7 @@ msgstr "请至少添加一个数据！" #: libraries/config.values.php:111 #: templates/columns_definitions/column_attributes.twig:208 #: templates/columns_definitions/column_attributes.twig:229 -#: templates/database/central_columns/main.twig:309 +#: templates/database/central_columns/main.twig:305 #: templates/database/designer/main.twig:588 templates/export.twig:433 #: templates/server/privileges/privileges_summary.twig:30 #: templates/server/status/monitor/index.twig:211 @@ -5807,9 +5849,9 @@ msgid "Explain output" msgstr "解析输出" #: libraries/classes/Controllers/JavaScriptMessagesController.php:275 -#: libraries/classes/Menu.php:495 +#: libraries/classes/Menu.php:496 #: libraries/classes/Server/Status/Processes.php:138 -#: libraries/classes/Util.php:1964 libraries/config.values.php:157 +#: libraries/classes/Util.php:1965 libraries/config.values.php:157 #: templates/database/events/editor_form.twig:25 #: templates/database/events/index.twig:44 #: templates/database/tracking/tables.twig:17 @@ -5958,7 +6000,7 @@ msgid "No parameters found!" msgstr "未找到参数！" #: libraries/classes/Controllers/JavaScriptMessagesController.php:325 -#: templates/database/central_columns/main.twig:271 +#: templates/database/central_columns/main.twig:269 #: templates/database/designer/main.twig:339 #: templates/database/designer/main.twig:390 #: templates/database/designer/main.twig:668 @@ -6082,7 +6124,7 @@ msgstr "正在修改字符集" #: libraries/classes/Plugins/Export/ExportTexytext.php:622 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:753 #: templates/config/form_display/input.twig:42 -#: templates/database/central_columns/main.twig:360 +#: templates/database/central_columns/main.twig:356 #: templates/database/data_dictionary/index.twig:47 #: templates/database/data_dictionary/index.twig:91 #: templates/database/designer/main.twig:1118 @@ -6187,10 +6229,10 @@ msgstr "显示查询框" #: libraries/classes/Controllers/JavaScriptMessagesController.php:389 #: libraries/classes/Display/Results.php:3161 -#: libraries/classes/Tracking.php:260 templates/console/bookmark_content.twig:7 -#: templates/database/central_columns/main.twig:270 -#: templates/database/central_columns/main.twig:384 -#: templates/database/central_columns/main.twig:385 +#: libraries/classes/Tracking.php:261 templates/console/bookmark_content.twig:7 +#: templates/database/central_columns/main.twig:268 +#: templates/database/central_columns/main.twig:380 +#: templates/database/central_columns/main.twig:381 #: templates/database/designer/main.twig:388 #: templates/database/qbe/ins_del_and_or_cell.twig:18 #: templates/database/search/results.twig:43 @@ -6230,7 +6272,7 @@ msgid "Variable %d:" msgstr "变量 %d：" #: libraries/classes/Controllers/JavaScriptMessagesController.php:399 -#: libraries/classes/Normalization.php:1058 +#: libraries/classes/Normalization.php:1057 msgid "Pick" msgstr "检出" @@ -6263,7 +6305,7 @@ msgid "Primary key added." msgstr "主键已添加。" #: libraries/classes/Controllers/JavaScriptMessagesController.php:411 -#: libraries/classes/Normalization.php:283 +#: libraries/classes/Normalization.php:282 msgid "Taking you to next step…" msgstr "等待进入下一步…" @@ -6273,10 +6315,10 @@ msgid "The first step of normalization is complete for table '%s'." msgstr "表“%s”标准化过程的第一步已经完成。" #: libraries/classes/Controllers/JavaScriptMessagesController.php:413 -#: libraries/classes/Normalization.php:541 -#: libraries/classes/Normalization.php:605 -#: libraries/classes/Normalization.php:702 -#: libraries/classes/Normalization.php:780 +#: libraries/classes/Normalization.php:540 +#: libraries/classes/Normalization.php:604 +#: libraries/classes/Normalization.php:701 +#: libraries/classes/Normalization.php:779 msgid "End of step" msgstr "完成" @@ -6286,7 +6328,7 @@ msgstr "标准化第二步（2NF）" #. l10n: Display text for calendar close link #: libraries/classes/Controllers/JavaScriptMessagesController.php:415 -#: libraries/classes/Normalization.php:376 +#: libraries/classes/Normalization.php:375 #: templates/javascript/variables.twig:15 msgid "Done" msgstr "完成" @@ -6366,8 +6408,8 @@ msgstr "没有已选择的依赖！" #: libraries/classes/Controllers/JavaScriptMessagesController.php:441 #: templates/columns_definitions/column_definitions_form.twig:160 #: templates/database/central_columns/edit.twig:22 -#: templates/database/central_columns/main.twig:121 -#: templates/database/central_columns/main.twig:274 +#: templates/database/central_columns/main.twig:119 +#: templates/database/central_columns/main.twig:272 #: templates/server/variables/index.twig:12 #: templates/table/gis_visualization/gis_visualization.twig:40 #: templates/table/insert/actions_panel.twig:7 @@ -6439,7 +6481,7 @@ msgstr "数据点内容" #: libraries/classes/Controllers/JavaScriptMessagesController.php:475 #: libraries/classes/Controllers/JavaScriptMessagesController.php:631 -#: libraries/classes/ErrorHandler.php:420 libraries/classes/InsertEdit.php:2015 +#: libraries/classes/ErrorHandler.php:420 libraries/classes/InsertEdit.php:2016 #: templates/table/index_form.twig:164 templates/table/index_form.twig:200 msgid "Ignore" msgstr "忽略" @@ -6756,7 +6798,7 @@ msgid "Generate password" msgstr "生成密码" #: libraries/classes/Controllers/JavaScriptMessagesController.php:592 -#: templates/server/replication/master_add_slave_user.twig:73 +#: templates/server/replication/primary_add_replica_user.twig:73 msgid "Generate" msgstr "生成" @@ -6996,7 +7038,7 @@ msgid "Table %s already exists!" msgstr "数据表 %s 已存在！" #: libraries/classes/Controllers/JavaScriptMessagesController.php:700 -#: libraries/classes/InsertEdit.php:331 +#: libraries/classes/InsertEdit.php:332 #: libraries/classes/Navigation/Nodes/NodeDatabaseChild.php:53 msgid "Hide" msgstr "隐藏" @@ -7014,17 +7056,17 @@ msgid "Fatal error: The navigation can only be accessed via AJAX" msgstr "致命错误：导航只能通过AJAX访问" #: libraries/classes/Controllers/NormalizationController.php:40 -#: libraries/classes/Normalization.php:246 +#: libraries/classes/Normalization.php:245 msgid "Select one…" msgstr "选择一个……" #: libraries/classes/Controllers/NormalizationController.php:41 -#: libraries/classes/Normalization.php:247 +#: libraries/classes/Normalization.php:246 msgid "No such column" msgstr "没有这样的字段" #: libraries/classes/Controllers/NormalizationController.php:46 -#: libraries/classes/Normalization.php:251 libraries/classes/Types.php:798 +#: libraries/classes/Normalization.php:250 libraries/classes/Types.php:798 msgctxt "string types" msgid "String" msgstr "文本" @@ -7686,17 +7728,27 @@ msgid "The number of joins that did a full scan of the first table." msgstr "在第一张表上进行了完整表扫描的多表查询数。" #: libraries/classes/Controllers/Server/Status/VariablesController.php:479 -msgid "The number of temporary tables currently open by the slave SQL thread." +#, fuzzy +#| msgid "" +#| "The number of temporary tables currently open by the slave SQL thread." +msgid "" +"The number of temporary tables currently open by the replica SQL thread." msgstr "当前由从 SQL 线程打开的临时表的数量。" #: libraries/classes/Controllers/Server/Status/VariablesController.php:481 +#, fuzzy +#| msgid "" +#| "Total (since startup) number of times the replication slave SQL thread " +#| "has retried transactions." msgid "" -"Total (since startup) number of times the replication slave SQL thread has " +"Total (since startup) number of times the replication replica SQL thread has " "retried transactions." msgstr "从 SQL 线程总共重试事务复制数。" #: libraries/classes/Controllers/Server/Status/VariablesController.php:483 -msgid "This is ON if this server is a slave that is connected to a master." +#, fuzzy +#| msgid "This is ON if this server is a slave that is connected to a master." +msgid "This is ON if this server is a replica that is connected to a primary." msgstr "如果该值为 ON，则这台服务器是一台已经连接到主服务器的从服务器。" #: libraries/classes/Controllers/Server/Status/VariablesController.php:485 @@ -7778,7 +7830,7 @@ msgid "The number of threads that are not sleeping." msgstr "非睡眠状态的线程数量。" #: libraries/classes/Controllers/Server/UserGroupsFormController.php:46 -#: libraries/classes/Util.php:850 +#: libraries/classes/Util.php:851 msgid "Missing parameter:" msgstr "缺少参数：" @@ -7836,7 +7888,7 @@ msgstr "" "器可以写入的 [em]config[/em] 文件夹。否则你只能下载或显示配置。" #: libraries/classes/Controllers/Sql/SqlController.php:239 -#: libraries/classes/Sql.php:1170 +#: libraries/classes/Sql.php:1172 #, php-format msgid "Bookmark %s has been created." msgstr "已创建书签 %s。" @@ -7937,8 +7989,8 @@ msgstr "您的请求有问题。" #: libraries/classes/Controllers/Table/GetFieldController.php:86 #: libraries/classes/Database/Routines.php:1242 -#: libraries/classes/Import.php:154 libraries/classes/InsertEdit.php:223 -#: libraries/classes/Sql.php:983 +#: libraries/classes/Import.php:154 libraries/classes/InsertEdit.php:224 +#: libraries/classes/Sql.php:985 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL 返回的查询结果为空 (即零行)。" @@ -7950,8 +8002,8 @@ msgstr "MySQL 返回的查询结果为空 (即零行)。" msgid "Maintenance operations on multiple tables are disabled." msgstr "对多个表的维护操作是禁用的。" -#: libraries/classes/Controllers/Table/OperationsController.php:108 -#: libraries/classes/Controllers/Table/OperationsController.php:301 +#: libraries/classes/Controllers/Table/OperationsController.php:109 +#: libraries/classes/Controllers/Table/OperationsController.php:302 #: libraries/classes/Controllers/Table/StructureController.php:100 #: libraries/classes/Navigation/Nodes/NodeView.php:28 #: templates/database/structure/show_create.twig:32 @@ -7965,7 +8017,7 @@ msgstr "视图" #: libraries/classes/Controllers/Table/Partition/TruncateController.php:66 #: libraries/classes/Controllers/View/OperationsController.php:90 #: libraries/classes/Html/Generator.php:875 libraries/classes/Import.php:138 -#: libraries/classes/InsertEdit.php:721 libraries/classes/Message.php:200 +#: libraries/classes/InsertEdit.php:722 libraries/classes/Message.php:200 #: templates/error/generic.twig:37 #: templates/table/structure/display_structure.twig:355 msgid "Error" @@ -8017,7 +8069,7 @@ msgstr "已成功移动字段。" #: libraries/classes/Controllers/Table/Structure/PartitioningController.php:267 #: libraries/classes/Controllers/Table/Structure/SaveController.php:273 -#: libraries/classes/Tracking.php:776 +#: libraries/classes/Tracking.php:777 msgid "Query error" msgstr "查询错误" @@ -8270,7 +8322,7 @@ msgid "" "Error in processing request: No event with name %1$s found in database %2$s." msgstr "处理请求时出错：在数据库 %2$s 中找不到名为 %1$s 的事件。" -#: libraries/classes/DatabaseInterface.php:1117 +#: libraries/classes/DatabaseInterface.php:1114 #, php-format msgid "" "Unable to use timezone \"%1$s\" for server %2$d. Please check your " @@ -8280,19 +8332,19 @@ msgstr "" "无法为服务器 %2$d 设置时区 “%1$s” 。请检查您的配置中 [em]$cfg['Servers']" "[%3$d]['SessionTimeZone'][/em] 字段。服务器当前使用默认时区。" -#: libraries/classes/DatabaseInterface.php:1164 +#: libraries/classes/DatabaseInterface.php:1161 msgid "Failed to set configured collation connection!" msgstr "无法设置配置的整理连接！" -#: libraries/classes/DatabaseInterface.php:1896 +#: libraries/classes/DatabaseInterface.php:1875 msgid "Missing connection parameters!" msgstr "缺少连接参数！" -#: libraries/classes/DatabaseInterface.php:1921 +#: libraries/classes/DatabaseInterface.php:1900 msgid "Connection for controluser as defined in your configuration failed." msgstr "使用配置文件中定义的控制用户连接失败。" -#: libraries/classes/DatabaseInterface.php:2399 +#: libraries/classes/DatabaseInterface.php:2378 #, php-format msgid "See %sour documentation%s for more information." msgstr "详情请查看%s我们的文档%s。" @@ -8315,23 +8367,23 @@ msgstr "插入" msgid "Del" msgstr "删除" -#: libraries/classes/Database/Qbe.php:1705 +#: libraries/classes/Database/Qbe.php:1707 msgid "Saved bookmarked search:" msgstr "搜索已经保存的书签：" -#: libraries/classes/Database/Qbe.php:1707 +#: libraries/classes/Database/Qbe.php:1709 msgid "New bookmark" msgstr "新建书签" -#: libraries/classes/Database/Qbe.php:1734 +#: libraries/classes/Database/Qbe.php:1736 msgid "Create bookmark" msgstr "创建书签" -#: libraries/classes/Database/Qbe.php:1737 +#: libraries/classes/Database/Qbe.php:1739 msgid "Update bookmark" msgstr "更新书签" -#: libraries/classes/Database/Qbe.php:1739 +#: libraries/classes/Database/Qbe.php:1741 msgid "Delete bookmark" msgstr "删除书签" @@ -8570,8 +8622,8 @@ msgid "Full texts" msgstr "完整内容" #: libraries/classes/Display/Results.php:1901 -#: libraries/classes/Display/Results.php:1927 libraries/classes/Util.php:2611 -#: libraries/classes/Util.php:2634 libraries/config.values.php:113 +#: libraries/classes/Display/Results.php:1927 libraries/classes/Util.php:2612 +#: libraries/classes/Util.php:2635 libraries/config.values.php:113 #: templates/database/multi_table_query/form.twig:69 #: templates/database/qbe/sort_select_cell.twig:7 #: templates/server/databases/index.twig:111 @@ -8584,8 +8636,8 @@ msgid "Descending" msgstr "递减" #: libraries/classes/Display/Results.php:1909 -#: libraries/classes/Display/Results.php:1919 libraries/classes/Util.php:2603 -#: libraries/classes/Util.php:2626 libraries/config.values.php:112 +#: libraries/classes/Display/Results.php:1919 libraries/classes/Util.php:2604 +#: libraries/classes/Util.php:2627 libraries/config.values.php:112 #: templates/database/multi_table_query/form.twig:68 #: templates/database/qbe/sort_select_cell.twig:5 #: templates/server/databases/index.twig:109 @@ -8626,7 +8678,7 @@ msgstr "总数为 %1$d，查询包含 %2$d" msgid "%d total" msgstr "共 %d 行" -#: libraries/classes/Display/Results.php:4205 libraries/classes/Sql.php:989 +#: libraries/classes/Display/Results.php:4205 libraries/classes/Sql.php:991 #, php-format msgid "Query took %01.4f seconds." msgstr "查询花费 %01.4f 秒。" @@ -9138,7 +9190,7 @@ msgstr "静态分析：" msgid "%d errors were found during analysis." msgstr "分析时发现%d个错误。" -#: libraries/classes/Import.php:294 libraries/classes/Sql.php:997 +#: libraries/classes/Import.php:294 libraries/classes/Sql.php:999 msgid "[ROLLBACK occurred.]" msgstr "[发生 ROLLBACK.]" @@ -9234,7 +9286,7 @@ msgid "" "removed." msgstr "索引 %1$s 和 %2$s 似乎是相同的，可以删除其中一个。" -#: libraries/classes/InsertEdit.php:347 +#: libraries/classes/InsertEdit.php:348 #: libraries/classes/Navigation/Nodes/NodeFunction.php:28 #: templates/database/routines/execute_form.twig:18 #: templates/table/search/index.twig:36 @@ -9242,7 +9294,7 @@ msgstr "索引 %1$s 和 %2$s 似乎是相同的，可以删除其中一个。" msgid "Function" msgstr "函数" -#: libraries/classes/InsertEdit.php:350 +#: libraries/classes/InsertEdit.php:351 #: libraries/classes/Plugins/Export/ExportHtmlword.php:278 #: libraries/classes/Plugins/Export/ExportHtmlword.php:373 #: libraries/classes/Plugins/Export/ExportLatex.php:541 @@ -9256,7 +9308,7 @@ msgstr "函数" #: templates/columns_definitions/table_fields_definitions.twig:12 #: templates/database/central_columns/edit.twig:9 #: templates/database/central_columns/main.twig:20 -#: templates/database/central_columns/main.twig:226 +#: templates/database/central_columns/main.twig:224 #: templates/database/data_dictionary/index.twig:23 #: templates/database/data_dictionary/index.twig:74 #: templates/database/events/index.twig:45 @@ -9276,12 +9328,12 @@ msgstr "函数" msgid "Type" msgstr "类型" -#: libraries/classes/InsertEdit.php:722 templates/import.twig:60 +#: libraries/classes/InsertEdit.php:723 templates/import.twig:60 #: templates/import.twig:85 msgid "The directory you set for upload work cannot be reached." msgstr "无法访问用于上传的文件夹。" -#: libraries/classes/InsertEdit.php:730 +#: libraries/classes/InsertEdit.php:731 #: templates/database/qbe/ins_del_and_or_cell.twig:24 #: templates/server/privileges/privileges_table.twig:32 #: templates/server/privileges/privileges_table.twig:59 @@ -9291,15 +9343,15 @@ msgstr "无法访问用于上传的文件夹。" msgid "Or" msgstr "或" -#: libraries/classes/InsertEdit.php:731 +#: libraries/classes/InsertEdit.php:732 msgid "web server upload directory:" msgstr "网站服务器上传文件夹：" -#: libraries/classes/InsertEdit.php:1338 libraries/classes/Sql.php:980 +#: libraries/classes/InsertEdit.php:1339 libraries/classes/Sql.php:982 msgid "Showing SQL query" msgstr "显示 SQL 查询" -#: libraries/classes/InsertEdit.php:1362 libraries/classes/Sql.php:960 +#: libraries/classes/InsertEdit.php:1363 libraries/classes/Sql.php:962 #, php-format msgid "Inserted row id: %1$d" msgstr "插入的行 id: %1$d" @@ -9318,9 +9370,9 @@ msgstr "由于超出最大长度，本次查询结果的归整化已禁用。" msgid "%1$s (near <code>%2$s</code>)" msgstr "%1$s (<code>%2$s</code> 附近)" -#: libraries/classes/Menu.php:242 +#: libraries/classes/Menu.php:243 #: libraries/classes/Navigation/Nodes/NodeTable.php:319 -#: libraries/classes/Util.php:1499 libraries/classes/Util.php:1993 +#: libraries/classes/Util.php:1500 libraries/classes/Util.php:1994 #: libraries/config.values.php:68 libraries/config.values.php:82 #: libraries/config.values.php:183 templates/database/search/results.twig:34 #: templates/database/structure/structure_table_row.twig:43 @@ -9328,10 +9380,10 @@ msgstr "%1$s (<code>%2$s</code> 附近)" msgid "Browse" msgstr "浏览" -#: libraries/classes/Menu.php:261 libraries/classes/Menu.php:368 +#: libraries/classes/Menu.php:262 libraries/classes/Menu.php:369 #: libraries/classes/Navigation/Nodes/NodeTable.php:310 -#: libraries/classes/Util.php:1497 libraries/classes/Util.php:1979 -#: libraries/classes/Util.php:1996 libraries/config.values.php:64 +#: libraries/classes/Util.php:1498 libraries/classes/Util.php:1980 +#: libraries/classes/Util.php:1997 libraries/config.values.php:64 #: libraries/config.values.php:78 libraries/config.values.php:169 #: libraries/config.values.php:179 templates/database/routines/index.twig:27 #: templates/database/routines/index.twig:28 @@ -9341,9 +9393,9 @@ msgstr "浏览" msgid "Search" msgstr "搜索" -#: libraries/classes/Menu.php:272 +#: libraries/classes/Menu.php:273 #: libraries/classes/Navigation/Nodes/NodeTable.php:313 -#: libraries/classes/Util.php:1498 libraries/classes/Util.php:1997 +#: libraries/classes/Util.php:1499 libraries/classes/Util.php:1998 #: libraries/config.values.php:66 libraries/config.values.php:80 #: libraries/config.values.php:181 #: templates/database/qbe/ins_del_and_or_cell.twig:6 @@ -9352,9 +9404,9 @@ msgstr "搜索" msgid "Insert" msgstr "插入" -#: libraries/classes/Menu.php:298 libraries/classes/Menu.php:408 -#: libraries/classes/Server/Privileges.php:2894 libraries/classes/Util.php:1984 -#: libraries/classes/Util.php:2000 libraries/config.values.php:161 +#: libraries/classes/Menu.php:299 libraries/classes/Menu.php:409 +#: libraries/classes/Server/Privileges.php:2894 libraries/classes/Util.php:1985 +#: libraries/classes/Util.php:2001 libraries/config.values.php:161 #: templates/database/privileges/index.twig:20 #: templates/server/privileges/privileges_summary.twig:15 #: templates/server/sub_page_header.twig:2 @@ -9362,19 +9414,19 @@ msgstr "插入" msgid "Privileges" msgstr "权限" -#: libraries/classes/Menu.php:309 libraries/classes/Menu.php:319 -#: libraries/classes/Menu.php:399 libraries/classes/Util.php:1500 -#: libraries/classes/Util.php:1983 libraries/classes/Util.php:2001 +#: libraries/classes/Menu.php:310 libraries/classes/Menu.php:320 +#: libraries/classes/Menu.php:400 libraries/classes/Util.php:1501 +#: libraries/classes/Util.php:1984 libraries/classes/Util.php:2002 #: libraries/config.values.php:171 templates/table/operations/view.twig:8 msgid "Operations" msgstr "操作" -#: libraries/classes/Menu.php:325 libraries/classes/Menu.php:434 -#: libraries/classes/Util.php:1988 libraries/classes/Util.php:2002 +#: libraries/classes/Menu.php:326 libraries/classes/Menu.php:435 +#: libraries/classes/Util.php:1989 libraries/classes/Util.php:2003 msgid "Tracking" msgstr "追踪" -#: libraries/classes/Menu.php:332 libraries/classes/Menu.php:427 +#: libraries/classes/Menu.php:333 libraries/classes/Menu.php:428 #: libraries/classes/Navigation/Nodes/NodeTriggerContainer.php:25 #: libraries/classes/Navigation/Nodes/NodeTriggerContainer.php:26 #: libraries/classes/Plugins/Export/ExportHtmlword.php:561 @@ -9383,76 +9435,76 @@ msgstr "追踪" #: libraries/classes/Plugins/Export/ExportSql.php:2087 #: libraries/classes/Plugins/Export/ExportTexytext.php:544 #: libraries/classes/Plugins/Export/ExportXml.php:120 -#: libraries/classes/Util.php:1987 libraries/classes/Util.php:2003 +#: libraries/classes/Util.php:1988 libraries/classes/Util.php:2004 #: templates/database/triggers/list.twig:3 msgid "Triggers" msgstr "触发器" -#: libraries/classes/Menu.php:373 libraries/classes/Menu.php:381 -#: libraries/classes/Menu.php:389 +#: libraries/classes/Menu.php:374 libraries/classes/Menu.php:382 +#: libraries/classes/Menu.php:390 msgid "Database seems to be empty!" msgstr "数据库是空的！" -#: libraries/classes/Menu.php:376 libraries/classes/Util.php:1980 +#: libraries/classes/Menu.php:377 libraries/classes/Util.php:1981 msgid "Query" msgstr "查询" -#: libraries/classes/Menu.php:414 libraries/classes/Util.php:1985 +#: libraries/classes/Menu.php:415 libraries/classes/Util.php:1986 #: templates/database/routines/index.twig:3 msgid "Routines" msgstr "程序" -#: libraries/classes/Menu.php:420 +#: libraries/classes/Menu.php:421 #: libraries/classes/Navigation/Nodes/NodeEventContainer.php:25 #: libraries/classes/Navigation/Nodes/NodeEventContainer.php:26 #: libraries/classes/Plugins/Export/ExportSql.php:1006 #: libraries/classes/Plugins/Export/ExportXml.php:100 -#: libraries/classes/Util.php:1986 templates/database/events/index.twig:3 +#: libraries/classes/Util.php:1987 templates/database/events/index.twig:3 msgid "Events" msgstr "事件" -#: libraries/classes/Menu.php:441 libraries/classes/Util.php:1989 +#: libraries/classes/Menu.php:442 libraries/classes/Util.php:1990 msgid "Designer" msgstr "设计器" -#: libraries/classes/Menu.php:448 libraries/classes/Util.php:1990 +#: libraries/classes/Menu.php:449 libraries/classes/Util.php:1991 #: templates/database/structure/check_all_tables.twig:32 msgid "Central columns" msgstr "文本框列" -#: libraries/classes/Menu.php:508 +#: libraries/classes/Menu.php:509 msgid "User accounts" msgstr "账户" -#: libraries/classes/Menu.php:543 libraries/classes/Server/Status/Data.php:152 -#: libraries/classes/Util.php:1969 templates/server/binlog/index.twig:3 +#: libraries/classes/Menu.php:544 libraries/classes/Server/Status/Data.php:152 +#: libraries/classes/Util.php:1970 templates/server/binlog/index.twig:3 msgid "Binary log" msgstr "二进制日志" -#: libraries/classes/Menu.php:550 libraries/classes/Server/Status/Data.php:157 -#: libraries/classes/Util.php:1970 +#: libraries/classes/Menu.php:551 libraries/classes/Server/Status/Data.php:157 +#: libraries/classes/Util.php:1971 #: templates/database/structure/body_for_table_summary.twig:11 #: templates/database/structure/table_header.twig:10 #: templates/server/replication/index.twig:5 msgid "Replication" msgstr "复制" -#: libraries/classes/Menu.php:556 libraries/classes/Server/Status/Data.php:229 -#: libraries/classes/Util.php:1971 libraries/config.values.php:159 +#: libraries/classes/Menu.php:557 libraries/classes/Server/Status/Data.php:229 +#: libraries/classes/Util.php:1972 libraries/config.values.php:159 #: templates/server/engines/show.twig:18 templates/server/engines/show.twig:21 #: templates/sql/query.twig:191 msgid "Variables" msgstr "变量" -#: libraries/classes/Menu.php:561 libraries/classes/Util.php:1972 +#: libraries/classes/Menu.php:562 libraries/classes/Util.php:1973 msgid "Charsets" msgstr "字符集" -#: libraries/classes/Menu.php:566 libraries/classes/Util.php:1974 +#: libraries/classes/Menu.php:567 libraries/classes/Util.php:1975 msgid "Engines" msgstr "引擎" -#: libraries/classes/Menu.php:571 libraries/classes/Util.php:1973 +#: libraries/classes/Menu.php:572 libraries/classes/Util.php:1974 #: templates/server/plugins/index.twig:4 msgid "Plugins" msgstr "插件" @@ -9666,23 +9718,23 @@ msgctxt "Create new view" msgid "New" msgstr "新建" -#: libraries/classes/Normalization.php:224 +#: libraries/classes/Normalization.php:223 msgid "Make all columns atomic" msgstr "使所有字段原子化" -#: libraries/classes/Normalization.php:226 -#: libraries/classes/Normalization.php:968 +#: libraries/classes/Normalization.php:225 +#: libraries/classes/Normalization.php:967 msgid "First step of normalization (1NF)" msgstr "第一范式" -#: libraries/classes/Normalization.php:229 -#: libraries/classes/Normalization.php:279 -#: libraries/classes/Normalization.php:325 -#: libraries/classes/Normalization.php:362 +#: libraries/classes/Normalization.php:228 +#: libraries/classes/Normalization.php:278 +#: libraries/classes/Normalization.php:324 +#: libraries/classes/Normalization.php:361 msgid "Step 1." msgstr "第1步。" -#: libraries/classes/Normalization.php:231 +#: libraries/classes/Normalization.php:230 msgid "" "Do you have any column which can be split into more than one column? For " "example: address can be split into street, city, country and zip." @@ -9690,29 +9742,29 @@ msgstr "" "有字段可以被拆分为多个字段吗？例如：地址可以被拆分为街道、城市、国家以及邮政" "编码等。" -#: libraries/classes/Normalization.php:237 +#: libraries/classes/Normalization.php:236 msgid "Show me the central list of columns that are not already in this table" msgstr "显示此表中尚未包含的列的中心列表" -#: libraries/classes/Normalization.php:239 +#: libraries/classes/Normalization.php:238 msgid "" "Select a column which can be split into more than one (on select of 'no such " "column', it'll move to next step)." msgstr "选择一个可以分割为一个以上的列（选择”无此列“将会移到下一步）。" -#: libraries/classes/Normalization.php:254 +#: libraries/classes/Normalization.php:253 msgid "split into " msgstr "拆分为 " -#: libraries/classes/Normalization.php:276 +#: libraries/classes/Normalization.php:275 msgid "Have a primary key" msgstr "存在主键" -#: libraries/classes/Normalization.php:282 +#: libraries/classes/Normalization.php:281 msgid "Primary key already exists." msgstr "主键已存在。" -#: libraries/classes/Normalization.php:287 +#: libraries/classes/Normalization.php:286 msgid "" "There is no primary key; please add one.<br>Hint: A primary key is a column " "(or combination of columns) that uniquely identify all rows." @@ -9720,24 +9772,24 @@ msgstr "" "没有主键；请添加。<b>提示：主键是能够对所有的记录都能唯一标识的字段（或字段组" "合）。" -#: libraries/classes/Normalization.php:295 +#: libraries/classes/Normalization.php:294 msgid "Add a primary key on existing column(s)" msgstr "使用已有字段（或字段组合）添加主键" -#: libraries/classes/Normalization.php:299 +#: libraries/classes/Normalization.php:298 msgid "" "If it's not possible to make existing column combinations as primary key" msgstr "如果无法将现有字段组合作为主键" -#: libraries/classes/Normalization.php:301 +#: libraries/classes/Normalization.php:300 msgid "+ Add a new primary key column" msgstr "+ 新建字段作为主键" -#: libraries/classes/Normalization.php:324 +#: libraries/classes/Normalization.php:323 msgid "Remove redundant columns" msgstr "删除冗余的字段" -#: libraries/classes/Normalization.php:327 +#: libraries/classes/Normalization.php:326 msgid "" "Do you have a group of columns which on combining gives an existing column? " "For example, if you have first_name, last_name and full_name then combining " @@ -9746,25 +9798,25 @@ msgstr "" "是否存 一组字段，其值合并后与现存的某一字段相同？例如：有“姓”和“名”和“姓名”三" "个字段，前二者的值合并后与“姓名”字段的值一致，这就形成了冗余。" -#: libraries/classes/Normalization.php:333 +#: libraries/classes/Normalization.php:332 msgid "" "Check the columns which are redundant and click on remove. If no redundant " "column, click on 'No redundant column'" msgstr "选中冗余的字段，点击删除。如果没有，点击“无冗余字段”" -#: libraries/classes/Normalization.php:338 +#: libraries/classes/Normalization.php:337 msgid "Remove selected" msgstr "删除选中的" -#: libraries/classes/Normalization.php:339 +#: libraries/classes/Normalization.php:338 msgid "No redundant column" msgstr "无冗余字段" -#: libraries/classes/Normalization.php:361 +#: libraries/classes/Normalization.php:360 msgid "Move repeating groups" msgstr "移动重复组" -#: libraries/classes/Normalization.php:364 +#: libraries/classes/Normalization.php:363 msgid "" "Do you have a group of two or more columns that are closely related and are " "all repeating the same attribute? For example, a table that holds data on " @@ -9776,25 +9828,25 @@ msgstr "" "1”、“作者2”、“作者3”之类的字段。在这种情况下，应当创建一个新表（包含书本ID和" "作者字段）。" -#: libraries/classes/Normalization.php:372 +#: libraries/classes/Normalization.php:371 msgid "" "Check the columns which form a repeating group. If no such group, click on " "'No repeating group'" msgstr "选择重复同一属性的各字段。如果没有，请点击“无重复字段组”" -#: libraries/classes/Normalization.php:377 +#: libraries/classes/Normalization.php:376 msgid "No repeating group" msgstr "无重复字段组" -#: libraries/classes/Normalization.php:405 +#: libraries/classes/Normalization.php:404 msgid "Step 2." msgstr "第二步。" -#: libraries/classes/Normalization.php:405 +#: libraries/classes/Normalization.php:404 msgid "Find partial dependencies" msgstr "查找部分依赖" -#: libraries/classes/Normalization.php:426 +#: libraries/classes/Normalization.php:425 #, php-format msgid "" "No partial dependencies possible as no non-primary column exists since " @@ -9803,30 +9855,30 @@ msgstr "" "由于不存在非主要列，因此不存在部分依赖性，因为主键（%1$s）由表中的所有列组" "成。" -#: libraries/classes/Normalization.php:432 -#: libraries/classes/Normalization.php:474 +#: libraries/classes/Normalization.php:431 +#: libraries/classes/Normalization.php:473 msgid "Table is already in second normal form." msgstr "资料表已经是第二正则化的。" -#: libraries/classes/Normalization.php:437 +#: libraries/classes/Normalization.php:436 #, php-format msgid "" "The primary key ( %1$s ) consists of more than one column so we need to find " "the partial dependencies." msgstr "主键 ( %1$s ) 由多个字段组成，因此我们需要查找部分依赖." -#: libraries/classes/Normalization.php:441 -#: libraries/classes/Normalization.php:877 +#: libraries/classes/Normalization.php:440 +#: libraries/classes/Normalization.php:876 msgid "" "Please answer the following question(s) carefully to obtain a correct " "normalization." msgstr "请仔细回答下列问题以得到正确的规范化." -#: libraries/classes/Normalization.php:443 +#: libraries/classes/Normalization.php:442 msgid "+ Show me the possible partial dependencies based on data in the table" msgstr "+ 根据表中数据向我展示可能的部分依赖关系" -#: libraries/classes/Normalization.php:446 +#: libraries/classes/Normalization.php:445 msgid "" "For each column below, please select the <b>minimal set</b> of columns among " "given set whose values combined together are sufficient to determine the " @@ -9835,62 +9887,62 @@ msgstr "" "对于下面的每一列，请在给定的值组合在一起足以确定列的值的列的集合当中选出列的" "<b>最小集合</b>。" -#: libraries/classes/Normalization.php:459 -#: libraries/classes/Normalization.php:919 +#: libraries/classes/Normalization.php:458 +#: libraries/classes/Normalization.php:918 #, php-format msgid "'%1$s' depends on:" msgstr "'%1$s' 依赖:" -#: libraries/classes/Normalization.php:470 +#: libraries/classes/Normalization.php:469 #, php-format msgid "" "No partial dependencies possible as the primary key ( %1$s ) has just one " "column." msgstr "主键( %1$s )只包含一个字段,没有可能的部分依赖。" -#: libraries/classes/Normalization.php:498 +#: libraries/classes/Normalization.php:497 #, php-format msgid "" "In order to put the original table '%1$s' into Second normal form we need to " "create the following tables:" msgstr "为了将原始表'%1$s'放入第二范式，我们需要创建以下表：" -#: libraries/classes/Normalization.php:536 +#: libraries/classes/Normalization.php:535 #, php-format msgid "The second step of normalization is complete for table '%1$s'." msgstr "标准化第二步请完成表“%1$s”。" -#: libraries/classes/Normalization.php:592 -#: libraries/classes/Normalization.php:767 -#: libraries/classes/Normalization.php:847 +#: libraries/classes/Normalization.php:591 +#: libraries/classes/Normalization.php:766 +#: libraries/classes/Normalization.php:846 msgid "Error in processing!" msgstr "处理时出现错误！" -#: libraries/classes/Normalization.php:641 +#: libraries/classes/Normalization.php:640 #, php-format msgid "" "In order to put the original table '%1$s' into Third normal form we need to " "create the following tables:" msgstr "为了将原始表'%1$s'放入第三范式，我们需要创建以下表：" -#: libraries/classes/Normalization.php:698 +#: libraries/classes/Normalization.php:697 msgid "The third step of normalization is complete." msgstr "标准化的第三步已完成。" -#: libraries/classes/Normalization.php:820 +#: libraries/classes/Normalization.php:819 #, php-format msgid "Selected repeating group has been moved to the table '%s'" msgstr "选定的重复组已移至表“%s”中" -#: libraries/classes/Normalization.php:875 +#: libraries/classes/Normalization.php:874 msgid "Step 3." msgstr "第三步." -#: libraries/classes/Normalization.php:875 +#: libraries/classes/Normalization.php:874 msgid "Find transitive dependencies" msgstr "查找传递依赖项" -#: libraries/classes/Normalization.php:879 +#: libraries/classes/Normalization.php:878 msgid "" "For each column below, please select the <b>minimal set</b> of columns among " "given set whose values combined together are sufficient to determine the " @@ -9900,79 +9952,79 @@ msgstr "" "对于下面的每一列，请在给定集合中选择列的<b>最小集合</b>，其值组合在一起足以确" "定列的值<br>注意：列可能没有传递依赖性，在这种情况下，您不必选择任何项。" -#: libraries/classes/Normalization.php:933 +#: libraries/classes/Normalization.php:932 msgid "" "No Transitive dependencies possible as the table doesn't have any non " "primary key columns" msgstr "没有传递依赖性，因为该表没有任何非主键列" -#: libraries/classes/Normalization.php:936 +#: libraries/classes/Normalization.php:935 msgid "Table is already in Third normal form!" msgstr "表已经处于第三范式！" -#: libraries/classes/Normalization.php:962 +#: libraries/classes/Normalization.php:961 msgid "Improve table structure (Normalization):" msgstr "改进表结构（规范化）：" -#: libraries/classes/Normalization.php:963 +#: libraries/classes/Normalization.php:962 msgid "Select up to what step you want to normalize" msgstr "选择您要标准化的步骤" -#: libraries/classes/Normalization.php:973 +#: libraries/classes/Normalization.php:972 msgid "Second step of normalization (1NF+2NF)" msgstr "规范化的第二步（第一范式 + 第二范式 ）" -#: libraries/classes/Normalization.php:978 +#: libraries/classes/Normalization.php:977 msgid "Third step of normalization (1NF+2NF+3NF)" msgstr "规范化的第三步（第一范式 + 第二范式 + 第三范式）" -#: libraries/classes/Normalization.php:983 +#: libraries/classes/Normalization.php:982 msgid "" "Hint: Please follow the procedure carefully in order to obtain correct " "normalization" msgstr "提示：请仔细按照程序进行，以获得正确的规范化" -#: libraries/classes/Normalization.php:1054 +#: libraries/classes/Normalization.php:1053 msgid "" "This list is based on a subset of the table's data and is not necessarily " "accurate. " msgstr "此列表基于表数据的子集，并不一定准确。 " -#: libraries/classes/Normalization.php:1069 +#: libraries/classes/Normalization.php:1068 msgid "No partial dependencies found!" msgstr "找不到部分依赖关系！" -#: libraries/classes/Operations.php:554 +#: libraries/classes/Operations.php:555 #: templates/table/structure/display_partitions.twig:84 msgid "Analyze" msgstr "分析" -#: libraries/classes/Operations.php:555 +#: libraries/classes/Operations.php:556 #: templates/table/structure/display_partitions.twig:94 msgid "Check" msgstr "检查" -#: libraries/classes/Operations.php:556 +#: libraries/classes/Operations.php:557 #: templates/table/structure/display_partitions.twig:104 msgid "Optimize" msgstr "优化" -#: libraries/classes/Operations.php:557 +#: libraries/classes/Operations.php:558 #: templates/table/structure/display_partitions.twig:114 msgid "Rebuild" msgstr "重建" -#: libraries/classes/Operations.php:558 +#: libraries/classes/Operations.php:559 #: templates/table/structure/display_partitions.twig:124 msgid "Repair" msgstr "修复" -#: libraries/classes/Operations.php:559 +#: libraries/classes/Operations.php:560 #: templates/table/structure/display_partitions.twig:134 msgid "Truncate" msgstr "清空" -#: libraries/classes/Operations.php:571 templates/database/events/index.twig:19 +#: libraries/classes/Operations.php:572 templates/database/events/index.twig:19 #: templates/database/events/index.twig:20 #: templates/database/events/index.twig:95 #: templates/database/events/index.twig:101 @@ -9998,39 +10050,39 @@ msgstr "清空" msgid "Drop" msgstr "删除" -#: libraries/classes/Operations.php:573 +#: libraries/classes/Operations.php:574 msgid "Coalesce" msgstr "联合" -#: libraries/classes/Operations.php:929 +#: libraries/classes/Operations.php:930 msgid "Can't move table to same one!" msgstr "目标数据表不能为源数据表！" -#: libraries/classes/Operations.php:931 +#: libraries/classes/Operations.php:932 msgid "Can't copy table to same one!" msgstr "目标数据表不能为源数据表！" -#: libraries/classes/Operations.php:955 +#: libraries/classes/Operations.php:956 #, php-format msgid "Table %s has been moved to %s. Privileges have been adjusted." msgstr "已将数据表 %s 移动到 %s。已调整权限。" -#: libraries/classes/Operations.php:961 +#: libraries/classes/Operations.php:962 #, php-format msgid "Table %s has been copied to %s. Privileges have been adjusted." msgstr "已将数据表 %s 复制为 %s。已调整权限。" -#: libraries/classes/Operations.php:968 +#: libraries/classes/Operations.php:969 #, php-format msgid "Table %s has been moved to %s." msgstr "已将数据表 %s 移动到 %s。" -#: libraries/classes/Operations.php:972 +#: libraries/classes/Operations.php:973 #, php-format msgid "Table %s has been copied to %s." msgstr "已将数据表 %s 复制为 %s。" -#: libraries/classes/Operations.php:996 +#: libraries/classes/Operations.php:997 msgid "The table name is empty!" msgstr "表名不能为空！" @@ -10240,7 +10292,7 @@ msgstr "转存表中的数据" #: templates/columns_definitions/table_fields_definitions.twig:30 #: templates/database/central_columns/edit.twig:14 #: templates/database/central_columns/main.twig:40 -#: templates/database/central_columns/main.twig:246 +#: templates/database/central_columns/main.twig:244 #: templates/database/data_dictionary/index.twig:24 #: templates/database/data_dictionary/index.twig:80 templates/indexes.twig:23 #: templates/table/insert/get_head_and_foot_of_insert_row_table.twig:8 @@ -10265,10 +10317,10 @@ msgstr "空" #: templates/columns_definitions/table_fields_definitions.twig:20 #: templates/database/central_columns/edit.twig:11 #: templates/database/central_columns/main.twig:28 -#: templates/database/central_columns/main.twig:234 +#: templates/database/central_columns/main.twig:232 #: templates/database/data_dictionary/index.twig:25 #: templates/database/structure/body_for_table_summary.twig:52 -#: templates/server/replication/slave_configuration.twig:9 +#: templates/server/replication/replica_configuration.twig:9 #: templates/table/structure/display_structure.twig:26 #: templates/table/tracking/structure_snapshot_columns.twig:10 msgid "Default" @@ -10292,7 +10344,7 @@ msgstr "链接到" #: templates/columns_definitions/table_fields_definitions.twig:9 #: templates/database/central_columns/edit.twig:8 #: templates/database/central_columns/main.twig:16 -#: templates/database/central_columns/main.twig:222 +#: templates/database/central_columns/main.twig:220 #: templates/database/events/index.twig:43 #: templates/database/routines/editor_form.twig:50 #: templates/database/routines/execute_form.twig:15 @@ -10398,8 +10450,8 @@ msgstr "首行放置列名：" #: libraries/classes/Plugins/Export/ExportLatex.php:210 #: libraries/classes/Plugins/Export/ExportSql.php:746 #: libraries/classes/Plugins/Export/ExportXml.php:232 -#: templates/server/replication/change_master.twig:22 -#: templates/server/replication/master_add_slave_user.twig:29 +#: templates/server/replication/change_primary.twig:22 +#: templates/server/replication/primary_add_replica_user.twig:29 msgid "Host:" msgstr "主机：" @@ -11007,7 +11059,7 @@ msgstr "" #. l10n: See https://www.php.net/manual/en/function.strftime.php #: libraries/classes/Plugins/Transformations/Abs/DateFormatTransformationsPlugin.php:72 -#: libraries/classes/Util.php:720 +#: libraries/classes/Util.php:721 msgid "%B %d, %Y at %I:%M %p" msgstr "%Y-%m-%d %H:%M:%S" @@ -11205,11 +11257,11 @@ msgid "" msgstr "" "使用HOTP和TOTP应用程序（如FreeOTP，Google身份验证器或Authy）提供身份验证。" -#: libraries/classes/Plugins/TwoFactor/Key.php:203 +#: libraries/classes/Plugins/TwoFactor/Key.php:204 msgid "Hardware Security Key (FIDO U2F)" msgstr "硬件安全密钥（FIDO U2F）" -#: libraries/classes/Plugins/TwoFactor/Key.php:213 +#: libraries/classes/Plugins/TwoFactor/Key.php:214 #, fuzzy #| msgid "" #| "Provides authentication using hardware security tokens supporting FIDO " @@ -11266,45 +11318,27 @@ msgstr "请检查数据库所在文件夹的权限。" msgid "Details…" msgstr "详细…" -#: libraries/classes/RecentFavoriteTable.php:156 +#: libraries/classes/RecentFavoriteTable.php:158 msgid "Could not save recent table!" msgstr "无法保存最近使用的表！" -#: libraries/classes/RecentFavoriteTable.php:160 +#: libraries/classes/RecentFavoriteTable.php:162 msgid "Could not save favorite table!" msgstr "无法保存到表收藏夹！" -#: libraries/classes/RecentFavoriteTable.php:246 +#: libraries/classes/RecentFavoriteTable.php:248 msgid "Recent tables" msgstr "最近使用的表" -#: libraries/classes/RecentFavoriteTable.php:248 +#: libraries/classes/RecentFavoriteTable.php:250 msgid "Recent" msgstr "近期访问" -#: libraries/classes/RecentFavoriteTable.php:252 +#: libraries/classes/RecentFavoriteTable.php:254 msgid "Favorites" msgstr "表收藏夹" -#: libraries/classes/Relation.php:1427 -msgid "no description" -msgstr "无说明" - -#: libraries/classes/Relation.php:1628 -#, fuzzy, php-format -#| msgid "" -#| "You do not have necessary privileges to create a database named '%s'. You " -#| "may go to 'Operations' tab of any database to set up the phpMyAdmin " -#| "configuration storage there." -msgid "" -"You do not have necessary privileges to create a database named '%s'. You " -"may go to 'Operations' tab of any database to set up the phpMyAdmin " -"configuration storage there." -msgstr "" -"您没有权限建立名为“phpmyadmin”的数据库。您可能需要到任一数据库的“操作”页面设" -"置 phpMyAdmin的储存位置 。" - -#: libraries/classes/ReplicationGui.php:439 +#: libraries/classes/ReplicationGui.php:438 msgid "" "Connection to server is disabled, please enable $cfg['AllowArbitraryServer'] " "in phpMyAdmin configuration." @@ -11312,59 +11346,66 @@ msgstr "" "与服务器的连接已被禁用，请在phpMyAdmin配置中启用" "$cfg['AllowArbitraryServer']。" -#: libraries/classes/ReplicationGui.php:450 +#: libraries/classes/ReplicationGui.php:449 msgid "Replication started successfully." msgstr "复制成功启动。" -#: libraries/classes/ReplicationGui.php:451 +#: libraries/classes/ReplicationGui.php:450 msgid "Error starting replication." msgstr "启动复制时出错。" -#: libraries/classes/ReplicationGui.php:454 +#: libraries/classes/ReplicationGui.php:453 msgid "Replication stopped successfully." msgstr "复制已成功停止。" -#: libraries/classes/ReplicationGui.php:455 +#: libraries/classes/ReplicationGui.php:454 msgid "Error stopping replication." msgstr "停止复制时出错。" -#: libraries/classes/ReplicationGui.php:458 +#: libraries/classes/ReplicationGui.php:457 msgid "Replication resetting successfully." msgstr "复制成功重置。" -#: libraries/classes/ReplicationGui.php:459 +#: libraries/classes/ReplicationGui.php:458 msgid "Error resetting replication." msgstr "重置复制时出错。" -#: libraries/classes/ReplicationGui.php:462 +#: libraries/classes/ReplicationGui.php:461 msgid "Success." msgstr "成功。" -#: libraries/classes/ReplicationGui.php:463 +#: libraries/classes/ReplicationGui.php:462 msgid "Error." msgstr "错误。" -#: libraries/classes/ReplicationGui.php:511 +#: libraries/classes/ReplicationGui.php:507 msgid "Unknown error" msgstr "未知错误" -#: libraries/classes/ReplicationGui.php:524 -#, php-format -msgid "Unable to connect to master %s." +#: libraries/classes/ReplicationGui.php:520 +#, fuzzy, php-format +#| msgid "Unable to connect to master %s." +msgid "Unable to connect to primary %s." msgstr "无法连接到主服务器 %s 。" -#: libraries/classes/ReplicationGui.php:534 +#: libraries/classes/ReplicationGui.php:530 +#, fuzzy +#| msgid "" +#| "Unable to read master log position. Possible privilege problem on master." msgid "" -"Unable to read master log position. Possible privilege problem on master." +"Unable to read primary log position. Possible privilege problem on primary." msgstr "无法读取主服务器日志。主服务器的权限设置可能有问题。" -#: libraries/classes/ReplicationGui.php:552 -msgid "Unable to change master!" +#: libraries/classes/ReplicationGui.php:548 +#, fuzzy +#| msgid "Unable to change master!" +msgid "Unable to change primary!" msgstr "无法修改主服务器！" -#: libraries/classes/ReplicationGui.php:556 -#, php-format -msgid "Master server changed successfully to %s." +#: libraries/classes/ReplicationGui.php:552 +#, fuzzy, php-format +#| msgid "Master server changed successfully to %s." +msgid "Primary server changed successfully to %s." msgstr "已成功修改主服务器到 %s。" #: libraries/classes/Routing.php:104 @@ -11383,28 +11424,28 @@ msgstr "404 错误！未找到页面 %s。" msgid "Error 405! Request method not allowed." msgstr "错误 405！请求的方法不被允许。" -#: libraries/classes/SavedSearches.php:245 +#: libraries/classes/SavedSearches.php:247 msgid "Please provide a name for this bookmarked search." msgstr "请为该搜索的书签提供一个名字。" -#: libraries/classes/SavedSearches.php:261 +#: libraries/classes/SavedSearches.php:263 msgid "Missing information to save the bookmarked search." msgstr "缺少保存搜索书签所必要的数据。" -#: libraries/classes/SavedSearches.php:284 -#: libraries/classes/SavedSearches.php:321 +#: libraries/classes/SavedSearches.php:286 +#: libraries/classes/SavedSearches.php:323 msgid "An entry with this name already exists." msgstr "该书签名已经存在。" -#: libraries/classes/SavedSearches.php:349 +#: libraries/classes/SavedSearches.php:351 msgid "Missing information to delete the search." msgstr "缺少删除搜索书签所必要的数据。" -#: libraries/classes/SavedSearches.php:378 +#: libraries/classes/SavedSearches.php:380 msgid "Missing information to load the search." msgstr "缺少载入搜索书签所必要的数据。" -#: libraries/classes/SavedSearches.php:400 +#: libraries/classes/SavedSearches.php:402 msgid "Error while loading the search." msgstr "加载搜索时出现错误。" @@ -11612,13 +11653,17 @@ msgstr "允许锁定当前线程的表。" #: libraries/classes/Server/Privileges.php:430 #: templates/server/privileges/privileges_table.twig:694 #: templates/server/privileges/privileges_table.twig:697 -msgid "Needed for the replication slaves." +#, fuzzy +#| msgid "Needed for the replication slaves." +msgid "Needed for the replication replicas." msgstr "回复附属者所需。" #: libraries/classes/Server/Privileges.php:435 #: templates/server/privileges/privileges_table.twig:681 #: templates/server/privileges/privileges_table.twig:684 -msgid "Allows the user to ask where the slaves / masters are." +#, fuzzy +#| msgid "Allows the user to ask where the slaves / masters are." +msgid "Allows the user to ask where the replicas / primaries are." msgstr "用户有权询问附属者/控制者在哪里。" #: libraries/classes/Server/Privileges.php:445 @@ -11853,16 +11898,22 @@ msgid "Show open tables" msgstr "显示打开的表" #: libraries/classes/Server/Status/Data.php:193 -msgid "Show slave hosts" +#, fuzzy +#| msgid "Show slave hosts" +msgid "Show replica hosts" msgstr "显示从服务器" #: libraries/classes/Server/Status/Data.php:200 -#: templates/server/replication/master_replication.twig:9 -msgid "Show master status" +#: templates/server/replication/primary_replication.twig:9 +#, fuzzy +#| msgid "Show master status" +msgid "Show primary status" msgstr "显示主服务器状态" #: libraries/classes/Server/Status/Data.php:207 -msgid "Show slave status" +#, fuzzy +#| msgid "Show slave status" +msgid "Show replica status" msgstr "显示从服务器状态" #: libraries/classes/Server/Status/Data.php:215 @@ -11874,9 +11925,9 @@ msgid "ID" msgstr "ID" #: libraries/classes/Server/Status/Processes.php:122 -#: templates/server/replication/master_add_slave_user.twig:32 -#: templates/server/replication/master_add_slave_user.twig:43 -#: templates/server/replication/master_replication.twig:25 +#: templates/server/replication/primary_add_replica_user.twig:32 +#: templates/server/replication/primary_add_replica_user.twig:43 +#: templates/server/replication/primary_replication.twig:25 msgid "Host" msgstr "主机" @@ -11888,22 +11939,6 @@ msgstr "命令" msgid "Progress" msgstr "进度" -#: libraries/classes/Server/UserGroups.php:121 -msgid "View users" -msgstr "查看用户" - -#: libraries/classes/Server/UserGroups.php:257 -msgid "Server-level tabs" -msgstr "服务器等级标签" - -#: libraries/classes/Server/UserGroups.php:262 -msgid "Database-level tabs" -msgstr "数据库等级标签" - -#: libraries/classes/Server/UserGroups.php:267 -msgid "Table-level tabs" -msgstr "表等级标签" - #: libraries/classes/Setup/Index.php:130 msgid "" "Reading of version failed. Maybe you're offline or the upgrade server does " @@ -11931,16 +11966,16 @@ msgstr "" msgid "No newer stable version is available" msgstr "没有新的稳定版本可用" -#: libraries/classes/Sql.php:500 +#: libraries/classes/Sql.php:502 #, php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "使用书签 \"%s\" 作为默认的查询。" -#: libraries/classes/Sql.php:977 +#: libraries/classes/Sql.php:979 msgid "Showing as PHP code" msgstr "显示为 PHP 代码" -#: libraries/classes/Sql.php:1343 +#: libraries/classes/Sql.php:1345 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " @@ -11949,7 +11984,7 @@ msgstr "" "当前所选内容没有包含唯一字段。单元格编辑、复选框、编辑、复制和删除无法正常使" "用。%s" -#: libraries/classes/Sql.php:1357 +#: libraries/classes/Sql.php:1359 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, Edit, Copy " @@ -11999,7 +12034,7 @@ msgstr "%s 在该 MySQL 服务器上被禁止了。" msgid "This MySQL server does not support the %s storage engine." msgstr "该 MySQL 服务器不支持 %s 存储引擎。" -#: libraries/classes/Table/Indexes.php:58 libraries/classes/Table.php:2143 +#: libraries/classes/Table/Indexes.php:58 libraries/classes/Table.php:2106 msgid "The name of the primary key must be \"PRIMARY\"!" msgstr "主键的名称必须称为 “PRIMARY”！" @@ -12008,50 +12043,50 @@ msgstr "主键的名称必须称为 “PRIMARY”！" msgid "Problems with indexes of table `%s`" msgstr "数据表 `%s` 的索引存在问题" -#: libraries/classes/Table.php:343 +#: libraries/classes/Table.php:345 msgid "Unknown table status:" msgstr "未知表状态：" -#: libraries/classes/Table.php:1006 +#: libraries/classes/Table.php:1008 #, php-format msgid "Source database `%s` was not found!" msgstr "未找到源数据库 `%s`！" -#: libraries/classes/Table.php:1015 +#: libraries/classes/Table.php:1017 #, php-format msgid "Target database `%s` was not found!" msgstr "未找到目标数据库 `%s`！" -#: libraries/classes/Table.php:1513 +#: libraries/classes/Table.php:1476 msgid "Invalid database:" msgstr "无效的数据库：" -#: libraries/classes/Table.php:1531 +#: libraries/classes/Table.php:1494 msgid "Invalid table name:" msgstr "无效的数据表名：" -#: libraries/classes/Table.php:1570 +#: libraries/classes/Table.php:1533 #, php-format msgid "Failed to rename table %1$s to %2$s!" msgstr "将表 %1$s 改名为 %2$s 失败！" -#: libraries/classes/Table.php:1587 +#: libraries/classes/Table.php:1550 #, php-format msgid "Table %1$s has been renamed to %2$s." msgstr "已将表 %1$s 改名为 %2$s。" -#: libraries/classes/Table.php:1829 +#: libraries/classes/Table.php:1792 msgid "Could not save table UI preferences!" msgstr "无法保存表界面设置！" -#: libraries/classes/Table.php:1857 +#: libraries/classes/Table.php:1820 #, php-format msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" msgstr "清除表界面设置失败（参见 $cfg['Servers'][$i]['MaxTableUiprefs'] %s）" -#: libraries/classes/Table.php:1994 +#: libraries/classes/Table.php:1957 #, php-format msgid "" "Cannot save UI property \"%s\". The changes made will not be persistent " @@ -12060,15 +12095,15 @@ msgid "" msgstr "" "无法保存用户界面属性“%s”。修改将在刷新本页后丢失。请检查表结构是否已修改。" -#: libraries/classes/Table.php:2155 +#: libraries/classes/Table.php:2118 msgid "Can't rename index to PRIMARY!" msgstr "无法将索引改为主键 (PRIMARY) ！" -#: libraries/classes/Table.php:2181 +#: libraries/classes/Table.php:2144 msgid "No index parts defined!" msgstr "没有定义的索引部分！" -#: libraries/classes/Table.php:2478 +#: libraries/classes/Table.php:2441 #, php-format msgid "Error creating foreign key on %1$s (check data types)" msgstr "在 %1$s 创建外键时发生错误 (检查数据类型)" @@ -12093,133 +12128,133 @@ msgstr "未找到主题 %s！" msgid "No valid image path for theme %s found!" msgstr "找不到主题 %s 的有效图片路径！" -#: libraries/classes/Tracking.php:236 +#: libraries/classes/Tracking.php:237 #: templates/database/tracking/tables.twig:115 #: templates/table/tracking/main.twig:73 msgid "Tracking report" msgstr "追踪报告" -#: libraries/classes/Tracking.php:240 +#: libraries/classes/Tracking.php:241 msgid "Tracking statements" msgstr "追踪语句" -#: libraries/classes/Tracking.php:255 +#: libraries/classes/Tracking.php:256 msgid "Delete tracking data row from report" msgstr "从报告中删除追踪数据" -#: libraries/classes/Tracking.php:267 +#: libraries/classes/Tracking.php:268 msgid "No data" msgstr "无数据" -#: libraries/classes/Tracking.php:312 +#: libraries/classes/Tracking.php:313 #: templates/database/operations/index.twig:130 #: templates/database/structure/copy_form.twig:19 #: templates/table/operations/index.twig:275 msgid "Structure only" msgstr "仅结构" -#: libraries/classes/Tracking.php:315 +#: libraries/classes/Tracking.php:316 #: templates/database/operations/index.twig:142 #: templates/database/structure/copy_form.twig:29 #: templates/table/operations/index.twig:287 msgid "Data only" msgstr "仅数据" -#: libraries/classes/Tracking.php:318 +#: libraries/classes/Tracking.php:319 #: templates/database/operations/index.twig:136 #: templates/database/structure/copy_form.twig:24 #: templates/table/operations/index.twig:281 msgid "Structure and data" msgstr "结构和数据" -#: libraries/classes/Tracking.php:383 libraries/classes/Tracking.php:451 +#: libraries/classes/Tracking.php:384 libraries/classes/Tracking.php:452 #, php-format msgid "Show %1$s with dates from %2$s to %3$s by user %4$s %5$s" msgstr "显示自 %2$s 起至 %3$s 用户 %4$s 执行的 %1$s %5$s" -#: libraries/classes/Tracking.php:472 +#: libraries/classes/Tracking.php:473 msgid "SQL dump (file download)" msgstr "SQL 转储 (文件下载)" -#: libraries/classes/Tracking.php:474 +#: libraries/classes/Tracking.php:475 msgid "SQL dump" msgstr "SQL 转储" -#: libraries/classes/Tracking.php:477 +#: libraries/classes/Tracking.php:478 msgid "This option will replace your table and contained data." msgstr "该选项将导致当前表的结构和数据被替换。" -#: libraries/classes/Tracking.php:479 +#: libraries/classes/Tracking.php:480 msgid "SQL execution" msgstr "执行 SQL 语句" -#: libraries/classes/Tracking.php:483 +#: libraries/classes/Tracking.php:484 #, php-format msgid "Export as %s" msgstr "导出为 %s" -#: libraries/classes/Tracking.php:521 +#: libraries/classes/Tracking.php:522 msgid "Data manipulation statement" msgstr "数据操作语句" -#: libraries/classes/Tracking.php:557 +#: libraries/classes/Tracking.php:558 msgid "Data definition statement" msgstr "数据定义语句" -#: libraries/classes/Tracking.php:640 +#: libraries/classes/Tracking.php:641 #: templates/database/tracking/tables.twig:126 #: templates/table/tracking/main.twig:80 msgid "Structure snapshot" msgstr "结构快照" -#: libraries/classes/Tracking.php:658 +#: libraries/classes/Tracking.php:659 #, php-format msgid "Version %s snapshot (SQL code)" msgstr "版本 %s 的快照 (SQL 代码)" -#: libraries/classes/Tracking.php:728 +#: libraries/classes/Tracking.php:729 msgid "Tracking data definition successfully deleted" msgstr "追踪数据定义删除成功" -#: libraries/classes/Tracking.php:740 +#: libraries/classes/Tracking.php:741 msgid "Tracking data manipulation successfully deleted" msgstr "追踪数据操作删除成功" -#: libraries/classes/Tracking.php:797 +#: libraries/classes/Tracking.php:798 msgid "" "You can execute the dump by creating and using a temporary database. Please " "ensure that you have the privileges to do so." msgstr "你可以通过创建一个临时数据库来执行这个转储。请确保你有足够的权限。" -#: libraries/classes/Tracking.php:801 +#: libraries/classes/Tracking.php:802 msgid "Comment out these two lines if you do not need them." msgstr "如果你不需要，请注释以下两行。" -#: libraries/classes/Tracking.php:812 +#: libraries/classes/Tracking.php:813 msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL 语句已导出。请复制保存或运行它。" -#: libraries/classes/Tracking.php:850 +#: libraries/classes/Tracking.php:851 #, php-format msgid "Tracking report for table `%s`" msgstr "`%s` 的追踪报告" -#: libraries/classes/Tracking.php:882 +#: libraries/classes/Tracking.php:883 #, php-format msgid "Tracking for %1$s was activated at version %2$s." msgstr "对%1$s 的追踪从版本 %2$s 已启用。" -#: libraries/classes/Tracking.php:885 +#: libraries/classes/Tracking.php:886 #, php-format msgid "Tracking for %1$s was deactivated at version %2$s." msgstr "对%1$s 的追踪从版本 %2$s 已停用。" -#: libraries/classes/Tracking.php:984 +#: libraries/classes/Tracking.php:985 #, php-format msgid "Version %1$s of %2$s was deleted." msgstr "%2$s的版本%1$s被删除了。" -#: libraries/classes/Tracking.php:1015 +#: libraries/classes/Tracking.php:1016 #, php-format msgid "Version %1$s was created, tracking for %2$s is active." msgstr "已创建版本 %1$s，%2$s 的追踪已启用。" @@ -12508,143 +12543,143 @@ msgstr "配置文件己更新。" msgid "Password is too long!" msgstr "密码太长！" -#: libraries/classes/UserPreferences.php:166 +#: libraries/classes/UserPreferences.php:167 msgid "Could not save configuration" msgstr "无法保存设置" -#: libraries/classes/Util.php:132 +#: libraries/classes/Util.php:133 #, php-format msgid "Max: %s%s" msgstr "最大限制：%s %s" #. l10n: Short month name #. l10n: Short month name for January -#: libraries/classes/Util.php:677 templates/javascript/variables.twig:34 +#: libraries/classes/Util.php:678 templates/javascript/variables.twig:34 msgid "Jan" msgstr "一月" #. l10n: Short month name #. l10n: Short month name for February -#: libraries/classes/Util.php:679 templates/javascript/variables.twig:35 +#: libraries/classes/Util.php:680 templates/javascript/variables.twig:35 msgid "Feb" msgstr "二月" #. l10n: Short month name #. l10n: Short month name for March -#: libraries/classes/Util.php:681 templates/javascript/variables.twig:36 +#: libraries/classes/Util.php:682 templates/javascript/variables.twig:36 msgid "Mar" msgstr "三月" #. l10n: Short month name #. l10n: Short month name for April -#: libraries/classes/Util.php:683 templates/javascript/variables.twig:37 +#: libraries/classes/Util.php:684 templates/javascript/variables.twig:37 msgid "Apr" msgstr "四月" #. l10n: Short month name -#: libraries/classes/Util.php:685 +#: libraries/classes/Util.php:686 msgctxt "Short month name" msgid "May" msgstr "五月" #. l10n: Short month name #. l10n: Short month name for June -#: libraries/classes/Util.php:687 templates/javascript/variables.twig:39 +#: libraries/classes/Util.php:688 templates/javascript/variables.twig:39 msgid "Jun" msgstr "六月" #. l10n: Short month name #. l10n: Short month name for July -#: libraries/classes/Util.php:689 templates/javascript/variables.twig:40 +#: libraries/classes/Util.php:690 templates/javascript/variables.twig:40 msgid "Jul" msgstr "七月" #. l10n: Short month name #. l10n: Short month name for August -#: libraries/classes/Util.php:691 templates/javascript/variables.twig:41 +#: libraries/classes/Util.php:692 templates/javascript/variables.twig:41 msgid "Aug" msgstr "八月" #. l10n: Short month name #. l10n: Short month name for September -#: libraries/classes/Util.php:693 templates/javascript/variables.twig:42 +#: libraries/classes/Util.php:694 templates/javascript/variables.twig:42 msgid "Sep" msgstr "九月" #. l10n: Short month name #. l10n: Short month name for October -#: libraries/classes/Util.php:695 templates/javascript/variables.twig:43 +#: libraries/classes/Util.php:696 templates/javascript/variables.twig:43 msgid "Oct" msgstr "十月" #. l10n: Short month name #. l10n: Short month name for November -#: libraries/classes/Util.php:697 templates/javascript/variables.twig:44 +#: libraries/classes/Util.php:698 templates/javascript/variables.twig:44 msgid "Nov" msgstr "十一月" #. l10n: Short month name #. l10n: Short month name for December -#: libraries/classes/Util.php:699 templates/javascript/variables.twig:45 +#: libraries/classes/Util.php:700 templates/javascript/variables.twig:45 msgid "Dec" msgstr "十二月" #. l10n: Short week day name for Sunday -#: libraries/classes/Util.php:703 +#: libraries/classes/Util.php:704 msgctxt "Short week day name for Sunday" msgid "Sun" msgstr "周日" #. l10n: Short week day name for Monday -#: libraries/classes/Util.php:705 templates/javascript/variables.twig:58 +#: libraries/classes/Util.php:706 templates/javascript/variables.twig:58 msgid "Mon" msgstr "周一" #. l10n: Short week day name for Tuesday -#: libraries/classes/Util.php:707 templates/javascript/variables.twig:59 +#: libraries/classes/Util.php:708 templates/javascript/variables.twig:59 msgid "Tue" msgstr "周二" #. l10n: Short week day name for Wednesday -#: libraries/classes/Util.php:709 templates/javascript/variables.twig:60 +#: libraries/classes/Util.php:710 templates/javascript/variables.twig:60 msgid "Wed" msgstr "周三" #. l10n: Short week day name for Thursday -#: libraries/classes/Util.php:711 templates/javascript/variables.twig:61 +#: libraries/classes/Util.php:712 templates/javascript/variables.twig:61 msgid "Thu" msgstr "周四" #. l10n: Short week day name for Friday -#: libraries/classes/Util.php:713 templates/javascript/variables.twig:62 +#: libraries/classes/Util.php:714 templates/javascript/variables.twig:62 msgid "Fri" msgstr "周五" #. l10n: Short week day name for Saturday -#: libraries/classes/Util.php:715 templates/javascript/variables.twig:63 +#: libraries/classes/Util.php:716 templates/javascript/variables.twig:63 msgid "Sat" msgstr "周六" -#: libraries/classes/Util.php:741 +#: libraries/classes/Util.php:742 msgctxt "AM/PM indication in time" msgid "PM" msgstr "下午" -#: libraries/classes/Util.php:743 +#: libraries/classes/Util.php:744 msgctxt "AM/PM indication in time" msgid "AM" msgstr "上午" -#: libraries/classes/Util.php:814 +#: libraries/classes/Util.php:815 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s 天 %s 小时，%s 分 %s 秒" -#: libraries/classes/Util.php:1965 +#: libraries/classes/Util.php:1966 msgid "Users" msgstr "用户" -#: libraries/classes/Util.php:2595 +#: libraries/classes/Util.php:2596 #: templates/database/multi_table_query/form.twig:67 msgid "Sort" msgstr "排序" @@ -12832,23 +12867,23 @@ msgstr "%s是错误的数据或没有验证" #: templates/columns_definitions/column_attributes.twig:31 #: templates/database/central_columns/edit_table_row.twig:23 -#: templates/database/central_columns/main.twig:73 -#: templates/database/central_columns/main.twig:302 +#: templates/database/central_columns/main.twig:71 +#: templates/database/central_columns/main.twig:298 msgid "Edit ENUM/SET values" msgstr "编辑ENUM / SET值" #: templates/columns_definitions/column_attributes.twig:38 #: templates/database/central_columns/edit_table_row.twig:30 -#: templates/database/central_columns/main.twig:78 -#: templates/database/central_columns/main.twig:313 +#: templates/database/central_columns/main.twig:76 +#: templates/database/central_columns/main.twig:309 msgctxt "for default" msgid "None" msgstr "无" #: templates/columns_definitions/column_attributes.twig:41 #: templates/database/central_columns/edit_table_row.twig:33 -#: templates/database/central_columns/main.twig:79 -#: templates/database/central_columns/main.twig:316 +#: templates/database/central_columns/main.twig:77 +#: templates/database/central_columns/main.twig:312 msgid "As defined:" msgstr "定义：" @@ -12905,7 +12940,7 @@ msgstr "数据表名" #: templates/columns_definitions/column_definitions_form.twig:32 #: templates/console/display.twig:99 -#: templates/database/central_columns/main.twig:198 templates/export.twig:285 +#: templates/database/central_columns/main.twig:196 templates/export.twig:285 #: templates/export.twig:301 templates/export.twig:317 msgid "Add" msgstr "添加" @@ -13076,7 +13111,7 @@ msgstr "对于默认值，请只输入单个值，不要加反斜杠或引号， #: templates/columns_definitions/table_fields_definitions.twig:24 #: templates/database/central_columns/edit.twig:12 #: templates/database/central_columns/main.twig:32 -#: templates/database/central_columns/main.twig:238 +#: templates/database/central_columns/main.twig:236 #: templates/database/data_dictionary/index.twig:79 #: templates/database/operations/index.twig:193 #: templates/database/operations/index.twig:197 @@ -13324,52 +13359,52 @@ msgid "Add new column" msgstr "添加新字段" #: templates/database/central_columns/main.twig:24 -#: templates/database/central_columns/main.twig:230 +#: templates/database/central_columns/main.twig:228 msgid "Length/Value" msgstr "长度/值" #: templates/database/central_columns/main.twig:36 -#: templates/database/central_columns/main.twig:242 +#: templates/database/central_columns/main.twig:240 msgid "Attribute" msgstr "属性" #: templates/database/central_columns/main.twig:44 -#: templates/database/central_columns/main.twig:250 +#: templates/database/central_columns/main.twig:248 msgid "A_I" msgstr "自增" -#: templates/database/central_columns/main.twig:131 +#: templates/database/central_columns/main.twig:129 msgid "The central list of columns for the current database is empty" msgstr "当前数据库的列的中央列表是空的" -#: templates/database/central_columns/main.twig:168 +#: templates/database/central_columns/main.twig:166 #: templates/display/results/table.twig:62 msgid "Filter rows" msgstr "过滤行" -#: templates/database/central_columns/main.twig:169 +#: templates/database/central_columns/main.twig:167 #: templates/display/results/table.twig:64 msgid "Search this table" msgstr "在表中搜索" -#: templates/database/central_columns/main.twig:180 +#: templates/database/central_columns/main.twig:178 #: templates/table/structure/display_structure.twig:417 msgid "Add column" msgstr "添加字段" -#: templates/database/central_columns/main.twig:189 +#: templates/database/central_columns/main.twig:187 msgid "Select a table" msgstr "选择表" -#: templates/database/central_columns/main.twig:196 +#: templates/database/central_columns/main.twig:194 msgid "Select a column." msgstr "选择字段。" -#: templates/database/central_columns/main.twig:215 +#: templates/database/central_columns/main.twig:213 msgid "Click to sort." msgstr "点击以排序。" -#: templates/database/central_columns/main.twig:220 +#: templates/database/central_columns/main.twig:218 #: templates/database/privileges/index.twig:22 #: templates/database/structure/table_header.twig:22 #: templates/database/tracking/tables.twig:18 @@ -13940,9 +13975,9 @@ msgstr "用户可以访问“%s”" #: templates/server/privileges/login_information_fields.twig:6 #: templates/server/privileges/login_information_fields.twig:11 #: templates/server/privileges/users_overview.twig:8 -#: templates/server/replication/change_master.twig:15 -#: templates/server/replication/master_add_slave_user.twig:19 -#: templates/server/replication/master_add_slave_user.twig:24 +#: templates/server/replication/change_primary.twig:15 +#: templates/server/replication/primary_add_replica_user.twig:19 +#: templates/server/replication/primary_add_replica_user.twig:24 #: templates/table/privileges/index.twig:19 msgid "User name" msgstr "用户名" @@ -15433,8 +15468,8 @@ msgstr "用户名：" #: templates/login/form.twig:85 #: templates/server/privileges/change_password.twig:21 #: templates/server/privileges/login_information_fields.twig:43 -#: templates/server/replication/change_master.twig:18 -#: templates/server/replication/master_add_slave_user.twig:49 +#: templates/server/replication/change_primary.twig:18 +#: templates/server/replication/primary_add_replica_user.twig:49 msgid "Password:" msgstr "密码：" @@ -15995,7 +16030,7 @@ msgid "Position" msgstr "位置" #: templates/server/binlog/index.twig:87 -#: templates/server/replication/master_replication.twig:24 +#: templates/server/replication/primary_replication.twig:24 msgid "Server ID" msgstr "服务器ID" @@ -16031,13 +16066,17 @@ msgstr "没有创建数据库的权限" #: templates/server/databases/index.twig:156 #: templates/server/replication/index.twig:18 -#: templates/server/replication/master_replication.twig:3 -msgid "Master replication" +#: templates/server/replication/primary_replication.twig:3 +#, fuzzy +#| msgid "Master replication" +msgid "Primary replication" msgstr "主复制" #: templates/server/databases/index.twig:160 -#: templates/server/replication/slave_configuration.twig:2 -msgid "Slave replication" +#: templates/server/replication/replica_configuration.twig:2 +#, fuzzy +#| msgid "Slave replication" +msgid "Replica replication" msgstr "从复制" #: templates/server/databases/index.twig:181 @@ -16155,7 +16194,7 @@ msgstr "强度：" #: templates/server/privileges/change_password.twig:32 #: templates/server/privileges/login_information_fields.twig:60 -#: templates/server/replication/master_add_slave_user.twig:62 +#: templates/server/replication/primary_add_replica_user.twig:62 msgid "Re-type:" msgstr "重新输入：" @@ -16226,13 +16265,13 @@ msgid "Login Information" msgstr "登录信息" #: templates/server/privileges/login_information_fields.twig:4 -#: templates/server/replication/change_master.twig:14 -#: templates/server/replication/master_add_slave_user.twig:16 +#: templates/server/replication/change_primary.twig:14 +#: templates/server/replication/primary_add_replica_user.twig:16 msgid "User name:" msgstr "用户名：" #: templates/server/privileges/login_information_fields.twig:7 -#: templates/server/replication/master_add_slave_user.twig:20 +#: templates/server/replication/primary_add_replica_user.twig:20 msgid "Any user" msgstr "任意用户" @@ -16255,27 +16294,27 @@ msgid "Host name:" msgstr "主机名：" #: templates/server/privileges/login_information_fields.twig:27 -#: templates/server/replication/master_add_slave_user.twig:34 +#: templates/server/replication/primary_add_replica_user.twig:34 msgid "Any host" msgstr "任意主机" #: templates/server/privileges/login_information_fields.twig:28 -#: templates/server/replication/master_add_slave_user.twig:35 +#: templates/server/replication/primary_add_replica_user.twig:35 msgid "Local" msgstr "本地" #: templates/server/privileges/login_information_fields.twig:30 -#: templates/server/replication/master_add_slave_user.twig:37 +#: templates/server/replication/primary_add_replica_user.twig:37 msgid "This host" msgstr "此主机" #: templates/server/privileges/login_information_fields.twig:32 -#: templates/server/replication/master_add_slave_user.twig:39 +#: templates/server/replication/primary_add_replica_user.twig:39 msgid "Use host table" msgstr "使用主机表" #: templates/server/privileges/login_information_fields.twig:39 -#: templates/server/replication/master_add_slave_user.twig:44 +#: templates/server/replication/primary_add_replica_user.twig:44 msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -16284,9 +16323,9 @@ msgstr "使用主机表时，此处的数据会被主机表中的数据所替换 #: templates/server/privileges/login_information_fields.twig:45 #: templates/server/privileges/login_information_fields.twig:53 #: templates/server/privileges/users_overview.twig:10 -#: templates/server/replication/change_master.twig:19 -#: templates/server/replication/master_add_slave_user.twig:52 -#: templates/server/replication/master_add_slave_user.twig:57 +#: templates/server/replication/change_primary.twig:19 +#: templates/server/replication/primary_add_replica_user.twig:52 +#: templates/server/replication/primary_add_replica_user.twig:57 msgid "Password" msgstr "密码" @@ -16295,12 +16334,12 @@ msgid "Do not change the password" msgstr "保持原密码" #: templates/server/privileges/login_information_fields.twig:49 -#: templates/server/replication/master_add_slave_user.twig:53 +#: templates/server/replication/primary_add_replica_user.twig:53 msgid "No password" msgstr "无密码" #: templates/server/privileges/login_information_fields.twig:62 -#: templates/server/replication/master_add_slave_user.twig:65 +#: templates/server/replication/primary_add_replica_user.twig:65 msgid "Re-type" msgstr "重新输入" @@ -16516,16 +16555,20 @@ msgstr "删除与用户同名的数据库。" msgid "Save changes" msgstr "保存修改" -#: templates/server/replication/change_master.twig:5 -msgid "Slave configuration" +#: templates/server/replication/change_primary.twig:5 +#, fuzzy +#| msgid "Slave configuration" +msgid "Replica configuration" msgstr "从服务器配置" -#: templates/server/replication/change_master.twig:6 -#: templates/server/replication/slave_configuration.twig:97 -msgid "Change or reconfigure master server" +#: templates/server/replication/change_primary.twig:6 +#: templates/server/replication/replica_configuration.twig:97 +#, fuzzy +#| msgid "Change or reconfigure master server" +msgid "Change or reconfigure primary server" msgstr "修改或重新配置主服务器" -#: templates/server/replication/change_master.twig:9 +#: templates/server/replication/change_primary.twig:9 msgid "" "Make sure you have a unique server-id in your configuration file (my.cnf). " "If not, please add the following line into [mysqld] section:" @@ -16533,14 +16576,17 @@ msgstr "" "请确保在你的配置文件 (my.cnf) 中具有唯一的服务器标识 (server-id) 。若没有，请" "添加此行到 [mysqld] 一节中:" -#: templates/server/replication/change_master.twig:26 +#: templates/server/replication/change_primary.twig:26 msgid "Port:" msgstr "端口：" #: templates/server/replication/index.twig:21 -#, php-format +#, fuzzy, php-format +#| msgid "" +#| "This server is not configured as master in a replication process. Would " +#| "you like to %sconfigure%s it?" msgid "" -"This server is not configured as master in a replication process. Would you " +"This server is not configured as primary in a replication process. Would you " "like to %sconfigure%s it?" msgstr "此服务器尚未配置为一个复制进程中的主服务器。你想现在%s配置%s吗？" @@ -16548,28 +16594,39 @@ msgstr "此服务器尚未配置为一个复制进程中的主服务器。你想 msgid "No privileges" msgstr "无权限" -#: templates/server/replication/master_add_slave_user.twig:6 -#: templates/server/replication/master_replication.twig:44 -msgid "Add slave replication user" +#: templates/server/replication/primary_add_replica_user.twig:6 +#: templates/server/replication/primary_replication.twig:44 +#, fuzzy +#| msgid "Add slave replication user" +msgid "Add replica replication user" msgstr "添加从复制用户" -#: templates/server/replication/master_add_slave_user.twig:21 -#: templates/server/replication/master_add_slave_user.twig:40 -#: templates/server/replication/master_add_slave_user.twig:54 +#: templates/server/replication/primary_add_replica_user.twig:21 +#: templates/server/replication/primary_add_replica_user.twig:40 +#: templates/server/replication/primary_add_replica_user.twig:54 msgid "Use text field:" msgstr "使用文本域：" -#: templates/server/replication/master_add_slave_user.twig:70 +#: templates/server/replication/primary_add_replica_user.twig:70 msgid "Generate password:" msgstr "生成密码：" -#: templates/server/replication/master_configuration.twig:2 -msgid "Master configuration" -msgstr "主服务器配置" +#: templates/server/replication/primary_configuration.twig:2 +#, fuzzy +#| msgid "Server configuration" +msgid "Primary configuration" +msgstr "服务器设置" -#: templates/server/replication/master_configuration.twig:4 +#: templates/server/replication/primary_configuration.twig:4 +#, fuzzy +#| msgid "" +#| "This server is not configured as a master server in a replication " +#| "process. You can choose from either replicating all databases and " +#| "ignoring some of them (useful if you want to replicate a majority of the " +#| "databases) or you can choose to ignore all databases by default and allow " +#| "only certain databases to be replicated. Please select the mode:" msgid "" -"This server is not configured as a master server in a replication process. " +"This server is not configured as a primary server in a replication process. " "You can choose from either replicating all databases and ignoring some of " "them (useful if you want to replicate a majority of the databases) or you " "can choose to ignore all databases by default and allow only certain " @@ -16579,123 +16636,160 @@ msgstr "" "某些数据库 (当你想复制大多数数据库时很有用) 或者忽略大多数并仅复制某些数据" "库。请选择模式:" -#: templates/server/replication/master_configuration.twig:9 +#: templates/server/replication/primary_configuration.twig:9 msgid "Replicate all databases; Ignore:" msgstr "复制所有数据库，除了:" -#: templates/server/replication/master_configuration.twig:10 +#: templates/server/replication/primary_configuration.twig:10 msgid "Ignore all databases; Replicate:" msgstr "仅复制:" -#: templates/server/replication/master_configuration.twig:12 +#: templates/server/replication/primary_configuration.twig:12 msgid "Please select databases:" msgstr "请选择数据库:" -#: templates/server/replication/master_configuration.twig:15 +#: templates/server/replication/primary_configuration.twig:15 msgid "" "Now, add the following lines at the end of [mysqld] section in your my.cnf " "and please restart the MySQL server afterwards." msgstr "现在，将下列行添加到你的 my.cnf 文件最后，然后重新启动 MySQL 服务器。" -#: templates/server/replication/master_configuration.twig:21 +#: templates/server/replication/primary_configuration.twig:21 +#, fuzzy +#| msgid "" +#| "Once you restarted MySQL server, please click on Go button. Afterwards, " +#| "you should see a message informing you, that this server <strong>is</" +#| "strong> configured as master." msgid "" "Once you restarted MySQL server, please click on Go button. Afterwards, you " "should see a message informing you, that this server <strong>is</strong> " -"configured as master." +"configured as primary." msgstr "" "当 MySQL 服务器重新启动后，请点击执行按钮。你应该看见一条提示信息说此服务器" "<strong>已经</strong>被配置为主服务器。" -#: templates/server/replication/master_replication.twig:5 -msgid "This server is configured as master in a replication process." +#: templates/server/replication/primary_replication.twig:5 +#, fuzzy +#| msgid "This server is configured as master in a replication process." +msgid "This server is configured as primary in a replication process." msgstr "此服务器已被配置为一个复制进程中的主服务器。" -#: templates/server/replication/master_replication.twig:16 -msgid "Show connected slaves" +#: templates/server/replication/primary_replication.twig:16 +#, fuzzy +#| msgid "Show connected slaves" +msgid "Show connected replicas" msgstr "查看已连接的从服务器" -#: templates/server/replication/master_replication.twig:38 +#: templates/server/replication/primary_replication.twig:38 +#, fuzzy +#| msgid "" +#| "Only slaves started with the --report-host=host_name option are visible " +#| "in this list." msgid "" -"Only slaves started with the --report-host=host_name option are visible in " +"Only replicas started with the --report-host=host_name option are visible in " "this list." msgstr "仅通过 --report-host=主机名 参数启动的从服务器可见。" -#: templates/server/replication/slave_configuration.twig:5 -msgid "Master connection:" -msgstr "主连接：" +#: templates/server/replication/replica_configuration.twig:5 +#, fuzzy +#| msgid "Server connection:" +msgid "Primary connection:" +msgstr "服务器连接:" -#: templates/server/replication/slave_configuration.twig:25 -msgid "Slave SQL Thread not running!" +#: templates/server/replication/replica_configuration.twig:25 +#, fuzzy +#| msgid "Slave SQL Thread not running!" +msgid "Replica SQL Thread not running!" msgstr "从 SQL 线程未启动！" -#: templates/server/replication/slave_configuration.twig:28 -msgid "Slave IO Thread not running!" +#: templates/server/replication/replica_configuration.twig:28 +#, fuzzy +#| msgid "Slave IO Thread not running!" +msgid "Replica IO Thread not running!" msgstr "从 IO 线程未启动！" -#: templates/server/replication/slave_configuration.twig:31 +#: templates/server/replication/replica_configuration.twig:31 +#, fuzzy +#| msgid "" +#| "Server is configured as slave in a replication process. Would you like to:" msgid "" -"Server is configured as slave in a replication process. Would you like to:" +"Server is configured as replica in a replication process. Would you like to:" msgstr "服务器已被配置为一个复制进程中的从服务器。你是否要:" -#: templates/server/replication/slave_configuration.twig:34 -msgid "See slave status table" +#: templates/server/replication/replica_configuration.twig:34 +#, fuzzy +#| msgid "See slave status table" +msgid "See replica status table" msgstr "查看从服务器状态" -#: templates/server/replication/slave_configuration.twig:38 -msgid "Control slave:" +#: templates/server/replication/replica_configuration.twig:38 +#, fuzzy +#| msgid "Control slave:" +msgid "Control replica:" msgstr "控制从服务器:" -#: templates/server/replication/slave_configuration.twig:48 -msgid "Reset slave" -msgstr "重置从服务器" +#: templates/server/replication/replica_configuration.twig:48 +#, fuzzy +#| msgid "Not replicated" +msgid "Reset replica" +msgstr "未复制" -#: templates/server/replication/slave_configuration.twig:54 +#: templates/server/replication/replica_configuration.twig:54 msgid "Start SQL Thread only" msgstr "仅启动 SQL 线程" -#: templates/server/replication/slave_configuration.twig:56 +#: templates/server/replication/replica_configuration.twig:56 msgid "Stop SQL Thread only" msgstr "仅停止 SQL 线程" -#: templates/server/replication/slave_configuration.twig:63 +#: templates/server/replication/replica_configuration.twig:63 msgid "Start IO Thread only" msgstr "仅启动 IO 线程" -#: templates/server/replication/slave_configuration.twig:65 +#: templates/server/replication/replica_configuration.twig:65 msgid "Stop IO Thread only" msgstr "仅停止 IO 线程" -#: templates/server/replication/slave_configuration.twig:74 +#: templates/server/replication/replica_configuration.twig:74 msgid "Error management:" msgstr "错误管理:" -#: templates/server/replication/slave_configuration.twig:77 -msgid "Skipping errors might lead into unsynchronized master and slave!" +#: templates/server/replication/replica_configuration.twig:77 +#, fuzzy +#| msgid "Skipping errors might lead into unsynchronized master and slave!" +msgid "Skipping errors might lead into unsynchronized primary and replica!" msgstr "忽略错误可能导致主从服务器间不同步！" -#: templates/server/replication/slave_configuration.twig:81 +#: templates/server/replication/replica_configuration.twig:81 msgid "Skip current error" msgstr "忽略当前错误" -#: templates/server/replication/slave_configuration.twig:87 +#: templates/server/replication/replica_configuration.twig:87 #, php-format msgid "Skip next %s errors." msgstr "跳过下一个%s错误。" -#: templates/server/replication/slave_configuration.twig:107 -#, php-format +#: templates/server/replication/replica_configuration.twig:107 +#, fuzzy, php-format +#| msgid "" +#| "This server is not configured as slave in a replication process. Would " +#| "you like to %sconfigure%s it?" msgid "" -"This server is not configured as slave in a replication process. Would you " +"This server is not configured as replica in a replication process. Would you " "like to %sconfigure%s it?" msgstr "此服务器尚未配置为一个复制进程中的从服务器。你想现在%s配置%s吗？" #: templates/server/replication/status_table.twig:6 -msgid "Master status" -msgstr "主服务器状态" +#, fuzzy +#| msgid "Import status" +msgid "Primary status" +msgstr "导入状态" #: templates/server/replication/status_table.twig:8 -msgid "Slave status" -msgstr "从服务器状态" +#, fuzzy +#| msgid "Replication status" +msgid "Replica status" +msgstr "复制状态" #: templates/server/replication/status_table.twig:16 #: templates/server/status/variables/index.twig:75 @@ -17062,17 +17156,29 @@ msgstr "" "确。" #: templates/server/status/status/index.twig:59 +#, fuzzy +#| msgid "" +#| "This MySQL server works as <b>master</b> and <b>slave</b> in " +#| "<b>replication</b> process." msgid "" -"This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</" -"b> process." +"This MySQL server works as <b>primary</b> and <b>replica</b> in " +"<b>replication</b> process." msgstr "此 MySQL 服务器正以<b>主</b>和<b>从</b>服务器运行于<b>复制</b>进程中。" #: templates/server/status/status/index.twig:61 -msgid "This MySQL server works as <b>master</b> in <b>replication</b> process." +#, fuzzy +#| msgid "" +#| "This MySQL server works as <b>master</b> in <b>replication</b> process." +msgid "" +"This MySQL server works as <b>primary</b> in <b>replication</b> process." msgstr "此 MySQL 服务器正以<b>主</b>服务器运行于<b>复制</b>进程中。" #: templates/server/status/status/index.twig:63 -msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process." +#, fuzzy +#| msgid "" +#| "This MySQL server works as <b>slave</b> in <b>replication</b> process." +msgid "" +"This MySQL server works as <b>replica</b> in <b>replication</b> process." msgstr "此 MySQL 服务器正以<b>从</b>服务器运行于<b>复制</b>进程中。" #: templates/server/status/status/index.twig:69 @@ -18092,6 +18198,24 @@ msgstr "视图名" msgid "Column names" msgstr "字段名" +#~ msgid "Do you really want to RESET SLAVE?" +#~ msgstr "您真的要执行“RESET SLAVE”吗？" + +#~ msgid "Master configuration" +#~ msgstr "主服务器配置" + +#~ msgid "Master connection:" +#~ msgstr "主连接：" + +#~ msgid "Reset slave" +#~ msgstr "重置从服务器" + +#~ msgid "Master status" +#~ msgstr "主服务器状态" + +#~ msgid "Slave status" +#~ msgstr "从服务器状态" + #~ msgid "SQL history" #~ msgstr "SQL 历史" |