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/en_GB.po | |
| parent | d2147a48a6fc8ae7156f32fc788681ff53217d11 (diff) | |
Update po files
[ci skip]
Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
Diffstat (limited to 'po/en_GB.po')
| -rw-r--r-- | po/en_GB.po | 1104 |
1 files changed, 614 insertions, 490 deletions
diff --git a/po/en_GB.po b/po/en_GB.po index 3abf62beff..1e30b7d674 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -5,7 +5,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-04-24 09:46+0000\n" "Last-Translator: William Desportes <williamdes@wdes.fr>\n" "Language-Team: English (United Kingdom) <https://hosted.weblate.org/projects/" @@ -284,11 +284,17 @@ msgid "Suboptimal caching method." msgstr "Suboptimal caching method." #: 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 "" "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/" @@ -1323,9 +1329,9 @@ msgstr "Search:" #: 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 @@ -1352,11 +1358,11 @@ msgstr "Search:" #: 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 @@ -1703,16 +1709,16 @@ msgctxt "Collation" msgid "Vietnamese" msgstr "Vietnamese" -#: libraries/classes/Common.php:241 +#: libraries/classes/Common.php:242 #, php-format msgid "You should upgrade to %s %s or later." msgstr "You should upgrade to %s %s or later." -#: libraries/classes/Common.php:273 +#: libraries/classes/Common.php:274 msgid "Error: Token mismatch" msgstr "Error: Token mismatch" -#: 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." @@ -1720,7 +1726,7 @@ msgstr "" "Failed to set session cookie. Maybe you are using HTTP instead of HTTPS to " "access 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 " @@ -1730,7 +1736,7 @@ msgstr "" "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" -#: 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!" @@ -1738,11 +1744,11 @@ msgstr "" "The ini_get and/or ini_set functions are disabled in php.ini. phpMyAdmin " "requires these functions!" -#: libraries/classes/Common.php:577 +#: libraries/classes/Common.php:580 msgid "GLOBALS overwrite attempt" msgstr "GLOBALS overwrite attempt" -#: libraries/classes/Common.php:587 +#: libraries/classes/Common.php:590 msgid "possible exploit" msgstr "possible exploit" @@ -3458,8 +3464,8 @@ msgid "First day of calendar" msgstr "First day of calendar" #: 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 @@ -3573,11 +3579,11 @@ msgstr "Configuration storage" msgid "Changes tracking" msgstr "Changes tracking" -#: 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" @@ -3861,7 +3867,7 @@ msgid "Recently used tables" msgstr "Recently used tables" #: libraries/classes/Config/Descriptions.php:858 -#: libraries/classes/RecentFavoriteTable.php:250 +#: libraries/classes/RecentFavoriteTable.php:252 msgid "Favorite tables" msgstr "Favourite tables" @@ -4226,16 +4232,16 @@ msgid "Skip locked tables" msgstr "Skip locked tables" #: 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 @@ -4531,13 +4537,13 @@ msgstr "Custom" #: 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 @@ -4579,10 +4585,10 @@ msgstr "Open-Document Text" #: 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 @@ -4624,9 +4630,9 @@ msgstr "CSV using 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 @@ -4816,6 +4822,37 @@ msgstr "" "%1$sGZip compression and decompression%2$s requires functions (%3$s) which " "are unavailable on this system." +#: libraries/classes/ConfigStorage/Relation.php:1432 +msgid "no description" +msgstr "no description" + +#: libraries/classes/ConfigStorage/Relation.php:1634 +#, 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." +msgstr "" +"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." + +#: libraries/classes/ConfigStorage/UserGroups.php:120 +msgid "View users" +msgstr "View users" + +#: libraries/classes/ConfigStorage/UserGroups.php:256 +msgid "Server-level tabs" +msgstr "Server-level tabs" + +#: libraries/classes/ConfigStorage/UserGroups.php:261 +msgid "Database-level tabs" +msgstr "Database-level tabs" + +#: libraries/classes/ConfigStorage/UserGroups.php:266 +msgid "Table-level tabs" +msgstr "Table-level tabs" + #: libraries/classes/Config/Validator.php:243 msgid "Could not connect to the database server!" msgstr "Could not connect to the database server!" @@ -4884,18 +4921,18 @@ msgstr "Not a non-negative number!" msgid "Value must be less than or equal to %s!" msgstr "Value must be less than or equal to %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] "Showing %1$d bookmark (both private and shared)" msgstr[1] "Showing %1$d bookmarks (both private and shared)" -#: libraries/classes/Console.php:97 +#: libraries/classes/Console.php:99 msgid "No bookmarks" msgstr "No bookmarks" -#: libraries/classes/Console.php:129 +#: libraries/classes/Console.php:131 msgid "SQL Query Console" msgstr "SQL Query Console" @@ -4944,7 +4981,7 @@ msgid "Could not load import plugins, please check your installation!" msgstr "Could not load import plug-ins, please check your installation!" #: 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 "No collation provided." @@ -5055,7 +5092,7 @@ msgstr "unknown" #: 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 @@ -5086,7 +5123,7 @@ msgstr "Yes" #: 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" @@ -5457,8 +5494,10 @@ msgid "Do you really want to remove partitioning?" msgstr "Do you really want to remove partitioning?" #: libraries/classes/Controllers/JavaScriptMessagesController.php:73 -msgid "Do you really want to RESET SLAVE?" -msgstr "Do you really want to 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 "Do you really want to revoke the selected user(s)?" #: libraries/classes/Controllers/JavaScriptMessagesController.php:75 msgid "" @@ -5633,7 +5672,7 @@ msgid "Removing Selected Users" msgstr "Removing Selected Users" #: 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 @@ -5726,13 +5765,13 @@ msgstr "Other" #. 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 "." @@ -5841,45 +5880,45 @@ msgstr "Processes" #. l10n: shortcuts for Byte #: libraries/classes/Controllers/JavaScriptMessagesController.php:193 -#: libraries/classes/Util.php:465 +#: libraries/classes/Util.php:466 msgid "B" msgstr "B" #. 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 "KiB" #. 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 "MiB" #. l10n: shortcuts for Gigabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:196 -#: libraries/classes/Util.php:471 +#: libraries/classes/Util.php:472 msgid "GiB" msgstr "GiB" #. l10n: shortcuts for Terabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:197 -#: libraries/classes/Util.php:473 +#: libraries/classes/Util.php:474 msgid "TiB" msgstr "TiB" #. l10n: shortcuts for Petabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:198 -#: libraries/classes/Util.php:475 +#: libraries/classes/Util.php:476 msgid "PiB" msgstr "PiB" #. l10n: shortcuts for Exabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:199 -#: libraries/classes/Util.php:477 +#: libraries/classes/Util.php:478 msgid "EiB" msgstr "EiB" @@ -5899,7 +5938,7 @@ msgid "Traffic" msgstr "Traffic" #: 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 "Settings" @@ -5920,7 +5959,7 @@ msgstr "Please add at least one variable to the series!" #: 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 @@ -6127,9 +6166,9 @@ msgid "Explain output" msgstr "Explain output" #: 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 @@ -6280,7 +6319,7 @@ msgid "No parameters found!" msgstr "No parameters found!" #: 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 @@ -6406,7 +6445,7 @@ msgstr "Changing charset" #: 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 @@ -6512,10 +6551,10 @@ msgstr "Show query box" #: 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 @@ -6557,7 +6596,7 @@ msgid "Variable %d:" msgstr "Variable %d:" #: libraries/classes/Controllers/JavaScriptMessagesController.php:399 -#: libraries/classes/Normalization.php:1058 +#: libraries/classes/Normalization.php:1057 msgid "Pick" msgstr "Pick" @@ -6591,7 +6630,7 @@ msgid "Primary key added." msgstr "Primary key added." #: libraries/classes/Controllers/JavaScriptMessagesController.php:411 -#: libraries/classes/Normalization.php:283 +#: libraries/classes/Normalization.php:282 msgid "Taking you to next step…" msgstr "Taking you to next step…" @@ -6601,10 +6640,10 @@ msgid "The first step of normalization is complete for table '%s'." msgstr "The first step of normalisation is complete for table '%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 "End of step" @@ -6614,7 +6653,7 @@ msgstr "Second step of normalisation (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 "Done" @@ -6698,8 +6737,8 @@ msgstr "No dependencies selected!" #: 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 @@ -6771,7 +6810,7 @@ msgstr "Data point content" #: 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 "Ignore" @@ -7103,7 +7142,7 @@ msgid "Generate password" msgstr "Generate password" #: 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 "Generate" @@ -7357,7 +7396,7 @@ msgid "Table %s already exists!" msgstr "Table %s already exists!" #: 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 "Hide" @@ -7375,17 +7414,17 @@ msgid "Fatal error: The navigation can only be accessed via AJAX" msgstr "Fatal error: The navigation can only be accessed via AJAX" #: libraries/classes/Controllers/NormalizationController.php:40 -#: libraries/classes/Normalization.php:246 +#: libraries/classes/Normalization.php:245 msgid "Select one…" msgstr "Select one…" #: libraries/classes/Controllers/NormalizationController.php:41 -#: libraries/classes/Normalization.php:247 +#: libraries/classes/Normalization.php:246 msgid "No such column" msgstr "No such column" #: 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 "String" @@ -8096,19 +8135,29 @@ msgid "The number of joins that did a full scan of the first table." msgstr "The number of joins that did a full scan of the first table." #: 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 "The number of temporary tables currently open by the slave SQL thread." #: 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 "" "Total (since startup) number of times the replication slave SQL thread has " "retried transactions." #: 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 "This is ON if this server is a slave that is connected to a master." #: libraries/classes/Controllers/Server/Status/VariablesController.php:485 @@ -8198,7 +8247,7 @@ msgid "The number of threads that are not sleeping." msgstr "The number of threads that are not sleeping." #: libraries/classes/Controllers/Server/UserGroupsFormController.php:46 -#: libraries/classes/Util.php:850 +#: libraries/classes/Util.php:851 msgid "Missing parameter:" msgstr "Missing parameter:" @@ -8263,7 +8312,7 @@ msgstr "" "Otherwise you will be only able to download or display it." #: 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 "Bookmark %s created." @@ -8367,8 +8416,8 @@ msgstr "There is an issue with your request." #: 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 returned an empty result set (i.e. zero rows)." @@ -8380,8 +8429,8 @@ msgstr "MySQL returned an empty result set (i.e. zero rows)." msgid "Maintenance operations on multiple tables are disabled." msgstr "Maintenance operations on multiple tables are disabled." -#: 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 @@ -8395,7 +8444,7 @@ msgstr "View" #: 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" @@ -8447,7 +8496,7 @@ msgstr "The columns have been moved successfully." #: 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 "Query error" @@ -8707,7 +8756,7 @@ msgid "" msgstr "" "Error in processing request: No event with name %1$s found in database %2$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 " @@ -8718,19 +8767,19 @@ msgstr "" "configuration setting for [em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. " "phpMyAdmin is currently using the default time zone of the database server." -#: libraries/classes/DatabaseInterface.php:1164 +#: libraries/classes/DatabaseInterface.php:1161 msgid "Failed to set configured collation connection!" msgstr "Failed to set configured collation connection!" -#: libraries/classes/DatabaseInterface.php:1896 +#: libraries/classes/DatabaseInterface.php:1875 msgid "Missing connection parameters!" msgstr "Missing connection parameters!" -#: libraries/classes/DatabaseInterface.php:1921 +#: libraries/classes/DatabaseInterface.php:1900 msgid "Connection for controluser as defined in your configuration failed." msgstr "Connection for controluser as defined in your configuration failed." -#: libraries/classes/DatabaseInterface.php:2399 +#: libraries/classes/DatabaseInterface.php:2378 #, php-format msgid "See %sour documentation%s for more information." msgstr "See %sour documentation%s for more information." @@ -8753,23 +8802,23 @@ msgstr "Ins" msgid "Del" msgstr "Del" -#: libraries/classes/Database/Qbe.php:1705 +#: libraries/classes/Database/Qbe.php:1707 msgid "Saved bookmarked search:" msgstr "Saved bookmarked search:" -#: libraries/classes/Database/Qbe.php:1707 +#: libraries/classes/Database/Qbe.php:1709 msgid "New bookmark" msgstr "New bookmark" -#: libraries/classes/Database/Qbe.php:1734 +#: libraries/classes/Database/Qbe.php:1736 msgid "Create bookmark" msgstr "Create bookmark" -#: libraries/classes/Database/Qbe.php:1737 +#: libraries/classes/Database/Qbe.php:1739 msgid "Update bookmark" msgstr "Update bookmark" -#: libraries/classes/Database/Qbe.php:1739 +#: libraries/classes/Database/Qbe.php:1741 msgid "Delete bookmark" msgstr "Delete bookmark" @@ -9016,8 +9065,8 @@ msgid "Full texts" msgstr "Full texts" #: 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 @@ -9030,8 +9079,8 @@ msgid "Descending" msgstr "Descending" #: 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 @@ -9072,7 +9121,7 @@ msgstr "%1$d total, %2$d in query" msgid "%d total" msgstr "%d total" -#: 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 "Query took %01.4f seconds." @@ -9615,7 +9664,7 @@ msgstr "Static analysis:" msgid "%d errors were found during analysis." msgstr "%d errors were found during analysis." -#: 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 occurred.]" @@ -9715,7 +9764,7 @@ msgstr "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." -#: 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 @@ -9723,7 +9772,7 @@ msgstr "" msgid "Function" msgstr "Function" -#: 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 @@ -9737,7 +9786,7 @@ msgstr "Function" #: 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 @@ -9757,12 +9806,12 @@ msgstr "Function" msgid "Type" msgstr "Type" -#: 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 "The directory you set for upload work cannot be reached." -#: 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 @@ -9772,15 +9821,15 @@ msgstr "The directory you set for upload work cannot be reached." msgid "Or" msgstr "Or" -#: libraries/classes/InsertEdit.php:731 +#: libraries/classes/InsertEdit.php:732 msgid "web server upload directory:" msgstr "web server upload directory:" -#: 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 "Showing SQL query" -#: 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 "Inserted row id: %1$d" @@ -9800,9 +9849,9 @@ msgstr "" msgid "%1$s (near <code>%2$s</code>)" msgstr "%1$s (near <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 @@ -9810,10 +9859,10 @@ msgstr "%1$s (near <code>%2$s</code>)" msgid "Browse" msgstr "Browse" -#: 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 @@ -9823,9 +9872,9 @@ msgstr "Browse" msgid "Search" msgstr "Search" -#: 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 @@ -9834,9 +9883,9 @@ msgstr "Search" msgid "Insert" msgstr "Insert" -#: 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 @@ -9844,19 +9893,19 @@ msgstr "Insert" msgid "Privileges" msgstr "Privileges" -#: 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 "Operations" -#: 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 "Tracking" -#: 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 @@ -9865,76 +9914,76 @@ msgstr "Tracking" #: 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 "Triggers" -#: 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 "Database seems to be empty!" -#: libraries/classes/Menu.php:376 libraries/classes/Util.php:1980 +#: libraries/classes/Menu.php:377 libraries/classes/Util.php:1981 msgid "Query" msgstr "Query" -#: 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 "Routines" -#: 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 "Events" -#: libraries/classes/Menu.php:441 libraries/classes/Util.php:1989 +#: libraries/classes/Menu.php:442 libraries/classes/Util.php:1990 msgid "Designer" msgstr "Designer" -#: 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 "Central columns" -#: libraries/classes/Menu.php:508 +#: libraries/classes/Menu.php:509 msgid "User accounts" msgstr "User accounts" -#: 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 "Binary log" -#: 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 "Replication" -#: 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 "Variables" -#: libraries/classes/Menu.php:561 libraries/classes/Util.php:1972 +#: libraries/classes/Menu.php:562 libraries/classes/Util.php:1973 msgid "Charsets" msgstr "Charsets" -#: libraries/classes/Menu.php:566 libraries/classes/Util.php:1974 +#: libraries/classes/Menu.php:567 libraries/classes/Util.php:1975 msgid "Engines" msgstr "Engines" -#: 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 "Plug-ins" @@ -10156,23 +10205,23 @@ msgctxt "Create new view" msgid "New" msgstr "New" -#: libraries/classes/Normalization.php:224 +#: libraries/classes/Normalization.php:223 msgid "Make all columns atomic" msgstr "Make all columns atomic" -#: 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 "First step of normalisation (1NF)" -#: 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 "Step 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." @@ -10180,11 +10229,11 @@ msgstr "" "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 post code." -#: 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 "Show me the central list of columns that are not already in this table" -#: 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)." @@ -10192,19 +10241,19 @@ msgstr "" "Select a column which can be split into more than one (on select of 'no such " "column', it'll move to next step)." -#: libraries/classes/Normalization.php:254 +#: libraries/classes/Normalization.php:253 msgid "split into " msgstr "split into " -#: libraries/classes/Normalization.php:276 +#: libraries/classes/Normalization.php:275 msgid "Have a primary key" msgstr "Have a primary key" -#: libraries/classes/Normalization.php:282 +#: libraries/classes/Normalization.php:281 msgid "Primary key already exists." msgstr "Primary key already exists." -#: 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." @@ -10212,25 +10261,25 @@ msgstr "" "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." -#: libraries/classes/Normalization.php:295 +#: libraries/classes/Normalization.php:294 msgid "Add a primary key on existing column(s)" msgstr "Add a primary key on existing column(s)" -#: 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 "" "If it's not possible to make existing column combinations as primary key" -#: libraries/classes/Normalization.php:301 +#: libraries/classes/Normalization.php:300 msgid "+ Add a new primary key column" msgstr "+ Add a new primary key column" -#: libraries/classes/Normalization.php:324 +#: libraries/classes/Normalization.php:323 msgid "Remove redundant columns" msgstr "Remove redundant columns" -#: 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 " @@ -10240,7 +10289,7 @@ msgstr "" "For example, if you have first_name, last_name and full_name then combining " "first_name and last_name gives full_name which is redundant." -#: 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'" @@ -10248,19 +10297,19 @@ msgstr "" "Check the columns which are redundant and click on remove. If no redundant " "column, click on 'No redundant column'" -#: libraries/classes/Normalization.php:338 +#: libraries/classes/Normalization.php:337 msgid "Remove selected" msgstr "Remove selected" -#: libraries/classes/Normalization.php:339 +#: libraries/classes/Normalization.php:338 msgid "No redundant column" msgstr "No redundant column" -#: libraries/classes/Normalization.php:361 +#: libraries/classes/Normalization.php:360 msgid "Move repeating groups" msgstr "Move repeating groups" -#: 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 " @@ -10274,7 +10323,7 @@ msgstr "" "on which form a repeating group. In this case a new table (book_id, author) " "should be created." -#: 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'" @@ -10282,19 +10331,19 @@ msgstr "" "Check the columns which form a repeating group. If no such group, click on " "'No repeating group'" -#: libraries/classes/Normalization.php:377 +#: libraries/classes/Normalization.php:376 msgid "No repeating group" msgstr "No repeating group" -#: libraries/classes/Normalization.php:405 +#: libraries/classes/Normalization.php:404 msgid "Step 2." msgstr "Step 2." -#: libraries/classes/Normalization.php:405 +#: libraries/classes/Normalization.php:404 msgid "Find partial dependencies" msgstr "Find partial dependencies" -#: libraries/classes/Normalization.php:426 +#: libraries/classes/Normalization.php:425 #, php-format msgid "" "No partial dependencies possible as no non-primary column exists since " @@ -10303,12 +10352,12 @@ msgstr "" "No partial dependencies possible as no non-primary column exists since " "primary key ( %1$s ) is composed of all the columns in the table." -#: 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 "Table is already in second normal form." -#: 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 " @@ -10317,8 +10366,8 @@ msgstr "" "The primary key ( %1$s ) consists of more than one column so we need to find " "the partial dependencies." -#: 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." @@ -10326,11 +10375,11 @@ msgstr "" "Please answer the following question(s) carefully to obtain a correct " "normalisation." -#: libraries/classes/Normalization.php:443 +#: libraries/classes/Normalization.php:442 msgid "+ Show me the possible partial dependencies based on data in the table" msgstr "+ Show me the possible partial dependencies based on data in the table" -#: 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 " @@ -10340,13 +10389,13 @@ msgstr "" "given set whose values combined together are sufficient to determine the " "value of the column." -#: 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' depends on:" -#: 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 " @@ -10355,7 +10404,7 @@ msgstr "" "No partial dependencies possible as the primary key ( %1$s ) has just one " "column." -#: 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 " @@ -10364,18 +10413,18 @@ msgstr "" "In order to put the original table '%1$s' into Second normal form we need to " "create the following tables:" -#: 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 "The second step of normalisation is complete for table '%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 "Error in processing!" -#: 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 " @@ -10384,24 +10433,24 @@ msgstr "" "In order to put the original table '%1$s' into Third normal form we need to " "create the following tables:" -#: libraries/classes/Normalization.php:698 +#: libraries/classes/Normalization.php:697 msgid "The third step of normalization is complete." msgstr "The third step of normalisation is complete." -#: libraries/classes/Normalization.php:820 +#: libraries/classes/Normalization.php:819 #, php-format msgid "Selected repeating group has been moved to the table '%s'" msgstr "Selected repeating group has been moved to the table '%s'" -#: libraries/classes/Normalization.php:875 +#: libraries/classes/Normalization.php:874 msgid "Step 3." msgstr "Step 3." -#: libraries/classes/Normalization.php:875 +#: libraries/classes/Normalization.php:874 msgid "Find transitive dependencies" msgstr "Find transitive dependencies" -#: 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 " @@ -10413,7 +10462,7 @@ msgstr "" "value of the column.<br>Note: A column may have no transitive dependency, in " "that case you don't have to select any." -#: 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" @@ -10421,27 +10470,27 @@ msgstr "" "No Transitive dependencies possible as the table doesn't have any non " "primary key columns" -#: libraries/classes/Normalization.php:936 +#: libraries/classes/Normalization.php:935 msgid "Table is already in Third normal form!" msgstr "Table is already in Third normal form!" -#: libraries/classes/Normalization.php:962 +#: libraries/classes/Normalization.php:961 msgid "Improve table structure (Normalization):" msgstr "Improve table structure (Normalisation):" -#: libraries/classes/Normalization.php:963 +#: libraries/classes/Normalization.php:962 msgid "Select up to what step you want to normalize" msgstr "Select up to what step you want to normalise" -#: libraries/classes/Normalization.php:973 +#: libraries/classes/Normalization.php:972 msgid "Second step of normalization (1NF+2NF)" msgstr "Second step of normalisation (1NF+2NF)" -#: libraries/classes/Normalization.php:978 +#: libraries/classes/Normalization.php:977 msgid "Third step of normalization (1NF+2NF+3NF)" msgstr "Third step of normalisation (1NF+2NF+3NF)" -#: libraries/classes/Normalization.php:983 +#: libraries/classes/Normalization.php:982 msgid "" "Hint: Please follow the procedure carefully in order to obtain correct " "normalization" @@ -10449,7 +10498,7 @@ msgstr "" "Hint: Please follow the procedure carefully in order to obtain correct " "normalisation" -#: 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. " @@ -10457,41 +10506,41 @@ msgstr "" "This list is based on a subset of the table's data and is not necessarily " "accurate. " -#: libraries/classes/Normalization.php:1069 +#: libraries/classes/Normalization.php:1068 msgid "No partial dependencies found!" msgstr "No partial dependencies found!" -#: libraries/classes/Operations.php:554 +#: libraries/classes/Operations.php:555 #: templates/table/structure/display_partitions.twig:84 msgid "Analyze" msgstr "Analyse" -#: libraries/classes/Operations.php:555 +#: libraries/classes/Operations.php:556 #: templates/table/structure/display_partitions.twig:94 msgid "Check" msgstr "Check" -#: libraries/classes/Operations.php:556 +#: libraries/classes/Operations.php:557 #: templates/table/structure/display_partitions.twig:104 msgid "Optimize" msgstr "Optimise" -#: libraries/classes/Operations.php:557 +#: libraries/classes/Operations.php:558 #: templates/table/structure/display_partitions.twig:114 msgid "Rebuild" msgstr "Rebuild" -#: libraries/classes/Operations.php:558 +#: libraries/classes/Operations.php:559 #: templates/table/structure/display_partitions.twig:124 msgid "Repair" msgstr "Repair" -#: libraries/classes/Operations.php:559 +#: libraries/classes/Operations.php:560 #: templates/table/structure/display_partitions.twig:134 msgid "Truncate" msgstr "Truncate" -#: 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 @@ -10517,39 +10566,39 @@ msgstr "Truncate" msgid "Drop" msgstr "Drop" -#: libraries/classes/Operations.php:573 +#: libraries/classes/Operations.php:574 msgid "Coalesce" msgstr "Coalesce" -#: libraries/classes/Operations.php:929 +#: libraries/classes/Operations.php:930 msgid "Can't move table to same one!" msgstr "Can't move table to same one!" -#: libraries/classes/Operations.php:931 +#: libraries/classes/Operations.php:932 msgid "Can't copy table to same one!" msgstr "Can't copy table to same one!" -#: 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 "Table %s has been moved to %s. Privileges have been adjusted." -#: 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 "Table %s has been copied to %s. Privileges have been adjusted." -#: libraries/classes/Operations.php:968 +#: libraries/classes/Operations.php:969 #, php-format msgid "Table %s has been moved to %s." msgstr "Table %s has been moved to %s." -#: libraries/classes/Operations.php:972 +#: libraries/classes/Operations.php:973 #, php-format msgid "Table %s has been copied to %s." msgstr "Table %s has been copied to %s." -#: libraries/classes/Operations.php:996 +#: libraries/classes/Operations.php:997 msgid "The table name is empty!" msgstr "The table name is empty!" @@ -10764,7 +10813,7 @@ msgstr "Dumping data for table" #: 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 @@ -10789,10 +10838,10 @@ msgstr "Null" #: 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" @@ -10816,7 +10865,7 @@ msgstr "Links to" #: 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 @@ -10922,8 +10971,8 @@ msgstr "Put columns names in the first row:" #: 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 "Host:" @@ -11550,7 +11599,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 "%B %d, %Y at %I:%M %p" @@ -11771,11 +11820,11 @@ msgstr "" "Authy provides authentication services (add security to accounts through a " "code)." -#: libraries/classes/Plugins/TwoFactor/Key.php:203 +#: libraries/classes/Plugins/TwoFactor/Key.php:204 msgid "Hardware Security Key (FIDO U2F)" msgstr "Hardware Sicherheitsschlüssel (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 " @@ -11835,42 +11884,27 @@ msgstr "Please check privileges of directory containing database." msgid "Details…" msgstr "Details…" -#: libraries/classes/RecentFavoriteTable.php:156 +#: libraries/classes/RecentFavoriteTable.php:158 msgid "Could not save recent table!" msgstr "Could not save recent table!" -#: libraries/classes/RecentFavoriteTable.php:160 +#: libraries/classes/RecentFavoriteTable.php:162 msgid "Could not save favorite table!" msgstr "Could not save favourite table!" -#: libraries/classes/RecentFavoriteTable.php:246 +#: libraries/classes/RecentFavoriteTable.php:248 msgid "Recent tables" msgstr "Recent tables" -#: libraries/classes/RecentFavoriteTable.php:248 +#: libraries/classes/RecentFavoriteTable.php:250 msgid "Recent" msgstr "Recent" -#: libraries/classes/RecentFavoriteTable.php:252 +#: libraries/classes/RecentFavoriteTable.php:254 msgid "Favorites" msgstr "Favourites" -#: libraries/classes/Relation.php:1427 -msgid "no description" -msgstr "no description" - -#: libraries/classes/Relation.php:1628 -#, 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." -msgstr "" -"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." - -#: libraries/classes/ReplicationGui.php:439 +#: libraries/classes/ReplicationGui.php:438 msgid "" "Connection to server is disabled, please enable $cfg['AllowArbitraryServer'] " "in phpMyAdmin configuration." @@ -11878,60 +11912,67 @@ msgstr "" "Connection to server is disabled, please enable $cfg['AllowArbitraryServer'] " "in phpMyAdmin configuration." -#: libraries/classes/ReplicationGui.php:450 +#: libraries/classes/ReplicationGui.php:449 msgid "Replication started successfully." msgstr "Replication started successfully." -#: libraries/classes/ReplicationGui.php:451 +#: libraries/classes/ReplicationGui.php:450 msgid "Error starting replication." msgstr "Error starting replication." -#: libraries/classes/ReplicationGui.php:454 +#: libraries/classes/ReplicationGui.php:453 msgid "Replication stopped successfully." msgstr "Replication stopped successfully." -#: libraries/classes/ReplicationGui.php:455 +#: libraries/classes/ReplicationGui.php:454 msgid "Error stopping replication." msgstr "Error stopping replication." -#: libraries/classes/ReplicationGui.php:458 +#: libraries/classes/ReplicationGui.php:457 msgid "Replication resetting successfully." msgstr "Replication resetting successfully." -#: libraries/classes/ReplicationGui.php:459 +#: libraries/classes/ReplicationGui.php:458 msgid "Error resetting replication." msgstr "Error resetting replication." -#: libraries/classes/ReplicationGui.php:462 +#: libraries/classes/ReplicationGui.php:461 msgid "Success." msgstr "Success." -#: libraries/classes/ReplicationGui.php:463 +#: libraries/classes/ReplicationGui.php:462 msgid "Error." msgstr "Error." -#: libraries/classes/ReplicationGui.php:511 +#: libraries/classes/ReplicationGui.php:507 msgid "Unknown error" msgstr "Unknown error" -#: 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 "Unable to connect to master %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 "" "Unable to read master log position. Possible privilege problem on master." -#: 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 "Unable to change master!" -#: 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 "Master server changed successfully to %s." #: libraries/classes/Routing.php:104 @@ -11952,28 +11993,28 @@ msgstr "Error 404! The page %s was not found." msgid "Error 405! Request method not allowed." msgstr "Error 405! Request method not allowed." -#: libraries/classes/SavedSearches.php:245 +#: libraries/classes/SavedSearches.php:247 msgid "Please provide a name for this bookmarked search." msgstr "Please provide a name for this bookmarked search." -#: libraries/classes/SavedSearches.php:261 +#: libraries/classes/SavedSearches.php:263 msgid "Missing information to save the bookmarked search." msgstr "Missing information to save the bookmarked search." -#: 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 "An entry with this name already exists." -#: libraries/classes/SavedSearches.php:349 +#: libraries/classes/SavedSearches.php:351 msgid "Missing information to delete the search." msgstr "Missing information to delete the search." -#: libraries/classes/SavedSearches.php:378 +#: libraries/classes/SavedSearches.php:380 msgid "Missing information to load the search." msgstr "Missing information to load the search." -#: libraries/classes/SavedSearches.php:400 +#: libraries/classes/SavedSearches.php:402 msgid "Error while loading the search." msgstr "Error while loading the search." @@ -12182,13 +12223,17 @@ msgstr "Allows locking tables for the current thread." #: 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 "Needed for the replication slaves." #: 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 "Allows the user to ask where the slaves / masters are." #: libraries/classes/Server/Privileges.php:445 @@ -12427,16 +12472,22 @@ msgid "Show open tables" msgstr "Show open tables" #: libraries/classes/Server/Status/Data.php:193 -msgid "Show slave hosts" +#, fuzzy +#| msgid "Show slave hosts" +msgid "Show replica hosts" msgstr "Show slave hosts" #: 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 "Show master status" #: libraries/classes/Server/Status/Data.php:207 -msgid "Show slave status" +#, fuzzy +#| msgid "Show slave status" +msgid "Show replica status" msgstr "Show slave status" #: libraries/classes/Server/Status/Data.php:215 @@ -12448,9 +12499,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 "Host" @@ -12462,22 +12513,6 @@ msgstr "Command" msgid "Progress" msgstr "Progress" -#: libraries/classes/Server/UserGroups.php:121 -msgid "View users" -msgstr "View users" - -#: libraries/classes/Server/UserGroups.php:257 -msgid "Server-level tabs" -msgstr "Server-level tabs" - -#: libraries/classes/Server/UserGroups.php:262 -msgid "Database-level tabs" -msgstr "Database-level tabs" - -#: libraries/classes/Server/UserGroups.php:267 -msgid "Table-level tabs" -msgstr "Table-level tabs" - #: libraries/classes/Setup/Index.php:130 msgid "" "Reading of version failed. Maybe you're offline or the upgrade server does " @@ -12507,16 +12542,16 @@ msgstr "" msgid "No newer stable version is available" msgstr "No newer stable version is available" -#: libraries/classes/Sql.php:500 +#: libraries/classes/Sql.php:502 #, php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "Using bookmark \"%s\" as default browse query." -#: libraries/classes/Sql.php:977 +#: libraries/classes/Sql.php:979 msgid "Showing as PHP code" msgstr "Showing as PHP code" -#: libraries/classes/Sql.php:1343 +#: libraries/classes/Sql.php:1345 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " @@ -12525,7 +12560,7 @@ msgstr "" "Current selection does not contain a unique column. Grid edit, checkbox, " "Edit, Copy and Delete features are not available. %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 " @@ -12576,7 +12611,7 @@ msgstr "%s has been disabled for this MySQL server." msgid "This MySQL server does not support the %s storage engine." msgstr "This MySQL server does not support the %s storage engine." -#: 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 "The name of the primary key must be \"PRIMARY\"!" @@ -12585,43 +12620,43 @@ msgstr "The name of the primary key must be \"PRIMARY\"!" msgid "Problems with indexes of table `%s`" msgstr "Problems with indexes of table `%s`" -#: libraries/classes/Table.php:343 +#: libraries/classes/Table.php:345 msgid "Unknown table status:" msgstr "Unknown table status:" -#: libraries/classes/Table.php:1006 +#: libraries/classes/Table.php:1008 #, php-format msgid "Source database `%s` was not found!" msgstr "Source database `%s` was not found!" -#: libraries/classes/Table.php:1015 +#: libraries/classes/Table.php:1017 #, php-format msgid "Target database `%s` was not found!" msgstr "Target database `%s` was not found!" -#: libraries/classes/Table.php:1513 +#: libraries/classes/Table.php:1476 msgid "Invalid database:" msgstr "Invalid database:" -#: libraries/classes/Table.php:1531 +#: libraries/classes/Table.php:1494 msgid "Invalid table name:" msgstr "Invalid table name:" -#: libraries/classes/Table.php:1570 +#: libraries/classes/Table.php:1533 #, php-format msgid "Failed to rename table %1$s to %2$s!" msgstr "Failed to rename table %1$s to %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 "Table %1$s has been renamed to %2$s." -#: libraries/classes/Table.php:1829 +#: libraries/classes/Table.php:1792 msgid "Could not save table UI preferences!" msgstr "Could not save table UI preferences!" -#: libraries/classes/Table.php:1857 +#: libraries/classes/Table.php:1820 #, php-format msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" @@ -12630,7 +12665,7 @@ msgstr "" "Failed to cleanup table UI preferences (see $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 " @@ -12641,15 +12676,15 @@ msgstr "" "after you refresh this page. Please check if the table structure has been " "changed." -#: libraries/classes/Table.php:2155 +#: libraries/classes/Table.php:2118 msgid "Can't rename index to PRIMARY!" msgstr "Can't rename index to PRIMARY!" -#: libraries/classes/Table.php:2181 +#: libraries/classes/Table.php:2144 msgid "No index parts defined!" msgstr "No index parts defined!" -#: libraries/classes/Table.php:2478 +#: libraries/classes/Table.php:2441 #, php-format msgid "Error creating foreign key on %1$s (check data types)" msgstr "Error creating foreign key on %1$s (check data types)" @@ -12674,99 +12709,99 @@ msgstr "Theme %s not found!" msgid "No valid image path for theme %s found!" msgstr "No valid image path for theme %s found!" -#: 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 "Tracking report" -#: libraries/classes/Tracking.php:240 +#: libraries/classes/Tracking.php:241 msgid "Tracking statements" msgstr "Tracking statements" -#: libraries/classes/Tracking.php:255 +#: libraries/classes/Tracking.php:256 msgid "Delete tracking data row from report" msgstr "Delete tracking data row from report" -#: libraries/classes/Tracking.php:267 +#: libraries/classes/Tracking.php:268 msgid "No data" msgstr "No data" -#: 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 "Structure only" -#: 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 "Data only" -#: 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 "Structure and data" -#: 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 "Show %1$s with dates from %2$s to %3$s by user %4$s %5$s" -#: libraries/classes/Tracking.php:472 +#: libraries/classes/Tracking.php:473 msgid "SQL dump (file download)" msgstr "SQL dump (file download)" -#: libraries/classes/Tracking.php:474 +#: libraries/classes/Tracking.php:475 msgid "SQL dump" msgstr "SQL dump" -#: libraries/classes/Tracking.php:477 +#: libraries/classes/Tracking.php:478 msgid "This option will replace your table and contained data." msgstr "This option will replace your table and contained data." -#: libraries/classes/Tracking.php:479 +#: libraries/classes/Tracking.php:480 msgid "SQL execution" msgstr "SQL execution" -#: libraries/classes/Tracking.php:483 +#: libraries/classes/Tracking.php:484 #, php-format msgid "Export as %s" msgstr "Export as %s" -#: libraries/classes/Tracking.php:521 +#: libraries/classes/Tracking.php:522 msgid "Data manipulation statement" msgstr "Data manipulation statement" -#: libraries/classes/Tracking.php:557 +#: libraries/classes/Tracking.php:558 msgid "Data definition statement" msgstr "Data definition statement" -#: 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 "Structure snapshot" -#: libraries/classes/Tracking.php:658 +#: libraries/classes/Tracking.php:659 #, php-format msgid "Version %s snapshot (SQL code)" msgstr "Version %s snapshot (SQL code)" -#: libraries/classes/Tracking.php:728 +#: libraries/classes/Tracking.php:729 msgid "Tracking data definition successfully deleted" msgstr "Tracking data definition successfully deleted" -#: libraries/classes/Tracking.php:740 +#: libraries/classes/Tracking.php:741 msgid "Tracking data manipulation successfully deleted" msgstr "Tracking data manipulation successfully deleted" -#: 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." @@ -12774,35 +12809,35 @@ msgstr "" "You can execute the dump by creating and using a temporary database. Please " "ensure that you have the privileges to do so." -#: libraries/classes/Tracking.php:801 +#: libraries/classes/Tracking.php:802 msgid "Comment out these two lines if you do not need them." msgstr "Comment out these two lines if you do not need them." -#: libraries/classes/Tracking.php:812 +#: libraries/classes/Tracking.php:813 msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL statements exported. Please copy the dump or execute it." -#: libraries/classes/Tracking.php:850 +#: libraries/classes/Tracking.php:851 #, php-format msgid "Tracking report for table `%s`" msgstr "Tracking report for table `%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 "Tracking for %1$s was activated at version %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 "Tracking for %1$s was deactivated at version %2$s." -#: libraries/classes/Tracking.php:984 +#: libraries/classes/Tracking.php:985 #, php-format msgid "Version %1$s of %2$s was deleted." msgstr "Version %1$s of %2$s was deleted." -#: 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 "Version %1$s was created, tracking for %2$s is active." @@ -13116,143 +13151,143 @@ msgstr "The profile has been updated." msgid "Password is too long!" msgstr "Password is too long!" -#: libraries/classes/UserPreferences.php:166 +#: libraries/classes/UserPreferences.php:167 msgid "Could not save configuration" msgstr "Could not save configuration" -#: libraries/classes/Util.php:132 +#: libraries/classes/Util.php:133 #, php-format msgid "Max: %s%s" msgstr "Max: %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 "Jan" #. 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 "Feb" #. 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 "Mar" #. 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 "Apr" #. l10n: Short month name -#: libraries/classes/Util.php:685 +#: libraries/classes/Util.php:686 msgctxt "Short month name" msgid "May" msgstr "May" #. 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 "Jun" #. 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 "Jul" #. 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 "Aug" #. 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 "Sep" #. 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 "Oct" #. 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 "Nov" #. 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 "Dec" #. 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 "Sun" #. 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 "Mon" #. 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 "Tue" #. 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 "Wed" #. 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 "Thu" #. 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 "Fri" #. 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 "Sat" -#: libraries/classes/Util.php:741 +#: libraries/classes/Util.php:742 msgctxt "AM/PM indication in time" msgid "PM" msgstr "PM" -#: libraries/classes/Util.php:743 +#: libraries/classes/Util.php:744 msgctxt "AM/PM indication in time" msgid "AM" msgstr "AM" -#: libraries/classes/Util.php:814 +#: libraries/classes/Util.php:815 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s days, %s hours, %s minutes and %s seconds" -#: libraries/classes/Util.php:1965 +#: libraries/classes/Util.php:1966 msgid "Users" msgstr "Users" -#: libraries/classes/Util.php:2595 +#: libraries/classes/Util.php:2596 #: templates/database/multi_table_query/form.twig:67 msgid "Sort" msgstr "Sort" @@ -13440,23 +13475,23 @@ msgstr "Wrong data or no validation for %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 "Edit ENUM/SET values" #: 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 "None" #: 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 "As defined:" @@ -13515,7 +13550,7 @@ msgstr "Table name" #: 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 "Add" @@ -13691,7 +13726,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 @@ -13944,52 +13979,52 @@ msgid "Add new column" msgstr "Add new column" #: 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 "Length/Value" #: templates/database/central_columns/main.twig:36 -#: templates/database/central_columns/main.twig:242 +#: templates/database/central_columns/main.twig:240 msgid "Attribute" msgstr "Attribute" #: 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 "A_I" -#: 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 "The central list of columns for the current database is empty" -#: templates/database/central_columns/main.twig:168 +#: templates/database/central_columns/main.twig:166 #: templates/display/results/table.twig:62 msgid "Filter rows" msgstr "Filter rows" -#: 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 "Search this table" -#: 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 "Add column" -#: templates/database/central_columns/main.twig:189 +#: templates/database/central_columns/main.twig:187 msgid "Select a table" msgstr "Select a table" -#: templates/database/central_columns/main.twig:196 +#: templates/database/central_columns/main.twig:194 msgid "Select a column." msgstr "Select a column." -#: templates/database/central_columns/main.twig:215 +#: templates/database/central_columns/main.twig:213 msgid "Click to sort." msgstr "Click to sort." -#: 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 @@ -14564,9 +14599,9 @@ msgstr "Users having access to \"%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 "User name" @@ -16079,8 +16114,8 @@ msgstr "Username:" #: 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 "Password:" @@ -16664,7 +16699,7 @@ msgid "Position" msgstr "Position" #: templates/server/binlog/index.twig:87 -#: templates/server/replication/master_replication.twig:24 +#: templates/server/replication/primary_replication.twig:24 msgid "Server ID" msgstr "Server ID" @@ -16700,13 +16735,17 @@ msgstr "No privileges to create databases" #: 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 "Master replication" #: 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 "Slave replication" #: templates/server/databases/index.twig:181 @@ -16825,7 +16864,7 @@ msgstr "Strength:" #: 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 "Re-type:" @@ -16901,13 +16940,13 @@ msgid "Login Information" msgstr "Login Information" #: 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 "User name:" #: 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 "Any user" @@ -16932,27 +16971,27 @@ msgid "Host name:" msgstr "Host name:" #: 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 "Any host" #: 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 "Local" #: 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 "This Host" #: 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 "Use host table" #: 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." @@ -16963,9 +17002,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 "Password" @@ -16974,12 +17013,12 @@ msgid "Do not change the password" msgstr "Do not change the password" #: 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 "No password" #: 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 "Re-type" @@ -17207,16 +17246,20 @@ msgstr "Drop the databases that have the same names as the users." msgid "Save changes" msgstr "Save page" -#: 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 "Slave configuration" -#: 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 "Change or reconfigure master server" -#: 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:" @@ -17224,14 +17267,17 @@ msgstr "" "Make sure you have a unique server-id in your configuration file (my.cnf). " "If not, please add the following line into [mysqld] section:" -#: templates/server/replication/change_master.twig:26 +#: templates/server/replication/change_primary.twig:26 msgid "Port:" msgstr "Port:" #: 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 "" "This server is not configured as master in a replication process. Would you " @@ -17241,28 +17287,39 @@ msgstr "" msgid "No privileges" msgstr "No privileges" -#: 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 "Add slave replication user" -#: 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 "Use text field:" -#: templates/server/replication/master_add_slave_user.twig:70 +#: templates/server/replication/primary_add_replica_user.twig:70 msgid "Generate password:" msgstr "Generate password:" -#: templates/server/replication/master_configuration.twig:2 -msgid "Master configuration" -msgstr "Master configuration" +#: templates/server/replication/primary_configuration.twig:2 +#, fuzzy +#| msgid "Server configuration" +msgid "Primary configuration" +msgstr "Server configuration" -#: 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 " @@ -17274,19 +17331,19 @@ msgstr "" "can choose to ignore all databases by default and allow only certain " "databases to be replicated. Please select the mode:" -#: templates/server/replication/master_configuration.twig:9 +#: templates/server/replication/primary_configuration.twig:9 msgid "Replicate all databases; Ignore:" msgstr "Replicate all databases; Ignore:" -#: templates/server/replication/master_configuration.twig:10 +#: templates/server/replication/primary_configuration.twig:10 msgid "Ignore all databases; Replicate:" msgstr "Ignore all databases; Replicate:" -#: templates/server/replication/master_configuration.twig:12 +#: templates/server/replication/primary_configuration.twig:12 msgid "Please select databases:" msgstr "Please select databases:" -#: 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." @@ -17294,111 +17351,148 @@ msgstr "" "Now, add the following lines at the end of [mysqld] section in your my.cnf " "and please restart the MySQL server afterwards." -#: 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 "" "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." -#: 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 "This server is configured as master in a replication process." -#: 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 "Show connected slaves" -#: 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 "" "Only slaves started with the --report-host=host_name option are visible in " "this list." -#: templates/server/replication/slave_configuration.twig:5 -msgid "Master connection:" -msgstr "Master connection:" +#: templates/server/replication/replica_configuration.twig:5 +#, fuzzy +#| msgid "Server connection:" +msgid "Primary connection:" +msgstr "Server connection:" -#: 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 "Slave SQL Thread not running!" -#: 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 "Slave IO Thread not running!" -#: 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 "" "Server is configured as slave in a replication process. Would you like to:" -#: 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 "See slave status table" -#: 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 "Control slave:" -#: templates/server/replication/slave_configuration.twig:48 -msgid "Reset slave" -msgstr "Reset slave" +#: templates/server/replication/replica_configuration.twig:48 +#, fuzzy +#| msgid "Not replicated" +msgid "Reset replica" +msgstr "Not replicated" -#: templates/server/replication/slave_configuration.twig:54 +#: templates/server/replication/replica_configuration.twig:54 msgid "Start SQL Thread only" msgstr "Start SQL Thread only" -#: templates/server/replication/slave_configuration.twig:56 +#: templates/server/replication/replica_configuration.twig:56 msgid "Stop SQL Thread only" msgstr "Stop SQL Thread only" -#: templates/server/replication/slave_configuration.twig:63 +#: templates/server/replication/replica_configuration.twig:63 msgid "Start IO Thread only" msgstr "Start IO Thread only" -#: templates/server/replication/slave_configuration.twig:65 +#: templates/server/replication/replica_configuration.twig:65 msgid "Stop IO Thread only" msgstr "Stop IO Thread only" -#: templates/server/replication/slave_configuration.twig:74 +#: templates/server/replication/replica_configuration.twig:74 msgid "Error management:" msgstr "Error management:" -#: 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 "Skipping errors might lead into unsynchronised master and slave!" -#: templates/server/replication/slave_configuration.twig:81 +#: templates/server/replication/replica_configuration.twig:81 msgid "Skip current error" msgstr "Skip current error" -#: templates/server/replication/slave_configuration.twig:87 +#: templates/server/replication/replica_configuration.twig:87 #, php-format msgid "Skip next %s errors." msgstr "Skip next %s errors." -#: 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 "" "This server is not configured as slave in a replication process. Would you " "like to %sconfigure%s it?" #: templates/server/replication/status_table.twig:6 -msgid "Master status" -msgstr "Master status" +#, fuzzy +#| msgid "Import status" +msgid "Primary status" +msgstr "Import status" #: templates/server/replication/status_table.twig:8 -msgid "Slave status" -msgstr "Slave status" +#, fuzzy +#| msgid "Replication status" +msgid "Replica status" +msgstr "Replication status" #: templates/server/replication/status_table.twig:16 #: templates/server/status/variables/index.twig:75 @@ -17778,20 +17872,32 @@ msgstr "" "reported by the MySQL server may be incorrect." #: 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 "" "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</" "b> process." #: 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 "" "This MySQL server works as <b>master</b> in <b>replication</b> process." #: 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 "This MySQL server works as <b>slave</b> in <b>replication</b> process." #: templates/server/status/status/index.twig:69 @@ -18822,6 +18928,24 @@ msgstr "VIEW name" msgid "Column names" msgstr "Column names" +#~ msgid "Do you really want to RESET SLAVE?" +#~ msgstr "Do you really want to RESET SLAVE?" + +#~ msgid "Master configuration" +#~ msgstr "Master configuration" + +#~ msgid "Master connection:" +#~ msgstr "Master connection:" + +#~ msgid "Reset slave" +#~ msgstr "Reset slave" + +#~ msgid "Master status" +#~ msgstr "Master status" + +#~ msgid "Slave status" +#~ msgstr "Slave status" + #~ msgid "SQL history" #~ msgstr "SQL history" |