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/ru.po | |
| parent | d2147a48a6fc8ae7156f32fc788681ff53217d11 (diff) | |
Update po files
[ci skip]
Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
Diffstat (limited to 'po/ru.po')
| -rw-r--r-- | po/ru.po | 1104 |
1 files changed, 614 insertions, 490 deletions
@@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 5.2.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2021-12-12 00:11+0000\n" +"POT-Creation-Date: 2021-12-19 00:12+0000\n" "PO-Revision-Date: 2021-01-22 17:26+0000\n" "Last-Translator: William Desportes <williamdes@wdes.fr>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/phpmyadmin/" @@ -296,11 +296,17 @@ msgid "Suboptimal caching method." msgstr "Оптимальный метод кеширования." #: libraries/advisory_rules_generic.php:190 +#, fuzzy +#| msgid "" +#| "You are using the MySQL Query cache with a fairly high traffic database. " +#| "It might be worth considering to use <a href=\"https://dev.mysql.com/doc/" +#| "refman/5.6/en/ha-memcached.html\">memcached</a> instead of the MySQL " +#| "Query cache, especially if you have multiple slaves." msgid "" "You are using the MySQL Query cache with a fairly high traffic database. It " "might be worth considering to use <a href=\"https://dev.mysql.com/doc/" "refman/5.6/en/ha-memcached.html\">memcached</a> instead of the MySQL Query " -"cache, especially if you have multiple slaves." +"cache, especially if you have multiple replicas." msgstr "" "Вы используете механизм кеширования запросов MySQL с базой данных, имеющей " "достаточно объемный трафик. Стоит обратить внимание на возможность " @@ -1394,9 +1400,9 @@ msgstr "Поиск:" #: libraries/classes/BrowseForeigners.php:206 #: libraries/classes/Controllers/JavaScriptMessagesController.php:324 #: libraries/classes/Controllers/Server/PrivilegesController.php:330 -#: libraries/classes/Normalization.php:256 -#: libraries/classes/Normalization.php:985 libraries/classes/Tracking.php:327 -#: libraries/classes/Tracking.php:481 +#: libraries/classes/Normalization.php:255 +#: libraries/classes/Normalization.php:984 libraries/classes/Tracking.php:328 +#: libraries/classes/Tracking.php:482 #: templates/columns_definitions/column_definitions_form.twig:43 #: templates/database/designer/main.twig:1102 #: templates/database/events/editor_form.twig:115 @@ -1423,11 +1429,11 @@ msgstr "Поиск:" #: templates/server/privileges/privileges_table.twig:858 #: templates/server/privileges/user_properties.twig:149 #: templates/server/privileges/users_overview.twig:159 -#: templates/server/replication/change_master.twig:33 -#: templates/server/replication/master_add_slave_user.twig:81 -#: templates/server/replication/master_configuration.twig:30 -#: templates/server/replication/slave_configuration.twig:16 -#: templates/server/replication/slave_configuration.twig:88 +#: templates/server/replication/change_primary.twig:33 +#: templates/server/replication/primary_add_replica_user.twig:81 +#: templates/server/replication/primary_configuration.twig:30 +#: templates/server/replication/replica_configuration.twig:16 +#: templates/server/replication/replica_configuration.twig:88 #: templates/server/user_groups/edit_user_groups.twig:21 #: templates/sql/query.twig:147 templates/sql/query.twig:198 #: templates/table/find_replace/index.twig:62 @@ -1774,16 +1780,16 @@ msgctxt "Collation" msgid "Vietnamese" msgstr "Вьетнамский" -#: libraries/classes/Common.php:241 +#: libraries/classes/Common.php:242 #, php-format msgid "You should upgrade to %s %s or later." msgstr "Необходимо обновить %s до версии %s или выше." -#: libraries/classes/Common.php:273 +#: libraries/classes/Common.php:274 msgid "Error: Token mismatch" msgstr "Ошибка: несоответствие токена" -#: libraries/classes/Common.php:485 +#: libraries/classes/Common.php:488 msgid "" "Failed to set session cookie. Maybe you are using HTTP instead of HTTPS to " "access phpMyAdmin." @@ -1791,7 +1797,7 @@ msgstr "" "Не удалось установить сессионные куки. Возможно вы подключаетесь через HTTP " "вместо HTTPS." -#: 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 " @@ -1801,7 +1807,7 @@ msgstr "" "func_overload. Для предотвращения возможной потери данных данный параметр " "должен быть выключен!" -#: 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!" @@ -1809,11 +1815,11 @@ msgstr "" "Функции ini_get и/или ini_set отключены в php.ini. В phpMyAdmin требуются " "эти функции!" -#: libraries/classes/Common.php:577 +#: libraries/classes/Common.php:580 msgid "GLOBALS overwrite attempt" msgstr "попытка перезаписи GLOBALS" -#: libraries/classes/Common.php:587 +#: libraries/classes/Common.php:590 msgid "possible exploit" msgstr "возможная уязвимость" @@ -3585,8 +3591,8 @@ msgid "First day of calendar" msgstr "Первый день календаря" #: libraries/classes/Config/Descriptions.php:751 -#: libraries/classes/Config/Descriptions.php:762 libraries/classes/Menu.php:485 -#: libraries/classes/Util.php:1962 libraries/config.values.php:155 +#: libraries/classes/Config/Descriptions.php:762 libraries/classes/Menu.php:486 +#: libraries/classes/Util.php:1963 libraries/config.values.php:155 #: templates/navigation/tree/database_select.twig:10 #: templates/server/databases/index.twig:3 templates/server/export/index.twig:7 #: templates/server/export/index.twig:14 @@ -3700,11 +3706,11 @@ msgstr "Хранение конфигурации" msgid "Changes tracking" msgstr "Слежение за изменениями" -#: libraries/classes/Config/Descriptions.php:778 libraries/classes/Menu.php:257 -#: libraries/classes/Menu.php:364 libraries/classes/Menu.php:490 +#: libraries/classes/Config/Descriptions.php:778 libraries/classes/Menu.php:258 +#: libraries/classes/Menu.php:365 libraries/classes/Menu.php:491 #: libraries/classes/Navigation/Nodes/NodeTable.php:316 -#: libraries/classes/Util.php:1496 libraries/classes/Util.php:1963 -#: libraries/classes/Util.php:1978 libraries/classes/Util.php:1995 +#: libraries/classes/Util.php:1497 libraries/classes/Util.php:1964 +#: libraries/classes/Util.php:1979 libraries/classes/Util.php:1996 #: libraries/config.values.php:62 libraries/config.values.php:76 #: libraries/config.values.php:167 libraries/config.values.php:177 msgid "SQL" @@ -3988,7 +3994,7 @@ msgid "Recently used tables" msgstr "Недавно использованные таблицы" #: libraries/classes/Config/Descriptions.php:858 -#: libraries/classes/RecentFavoriteTable.php:250 +#: libraries/classes/RecentFavoriteTable.php:252 msgid "Favorite tables" msgstr "Избранные таблицы" @@ -4353,16 +4359,16 @@ msgid "Skip locked tables" msgstr "Пропускать заблокированные таблицы" #: libraries/classes/Config/Descriptions.php:949 +#: libraries/classes/ConfigStorage/UserGroups.php:129 #: libraries/classes/Controllers/JavaScriptMessagesController.php:388 #: libraries/classes/Display/Results.php:3090 #: libraries/classes/Html/Generator.php:670 #: libraries/classes/Html/Generator.php:927 -#: libraries/classes/Server/UserGroups.php:130 #: templates/console/bookmark_content.twig:7 templates/console/display.twig:31 #: templates/console/display.twig:175 -#: templates/database/central_columns/main.twig:267 -#: templates/database/central_columns/main.twig:380 -#: templates/database/central_columns/main.twig:381 +#: templates/database/central_columns/main.twig:265 +#: templates/database/central_columns/main.twig:376 +#: templates/database/central_columns/main.twig:377 #: templates/database/events/index.twig:74 #: templates/database/events/index.twig:77 #: templates/database/events/row.twig:23 templates/database/events/row.twig:26 @@ -4667,13 +4673,13 @@ msgstr "Обычно" #: libraries/classes/Config/Forms/User/ExportForm.php:100 #: libraries/classes/Config/Forms/User/ExportForm.php:128 #: libraries/classes/Controllers/JavaScriptMessagesController.php:702 -#: libraries/classes/Import.php:1324 libraries/classes/Menu.php:249 -#: libraries/classes/Menu.php:359 +#: libraries/classes/Import.php:1324 libraries/classes/Menu.php:250 +#: libraries/classes/Menu.php:360 #: libraries/classes/Navigation/Nodes/NodeColumn.php:42 #: libraries/classes/Navigation/Nodes/NodeDatabase.php:50 #: libraries/classes/Navigation/Nodes/NodeTable.php:307 -#: libraries/classes/Util.php:1495 libraries/classes/Util.php:1977 -#: libraries/classes/Util.php:1994 libraries/config.values.php:60 +#: libraries/classes/Util.php:1496 libraries/classes/Util.php:1978 +#: libraries/classes/Util.php:1995 libraries/config.values.php:60 #: libraries/config.values.php:74 libraries/config.values.php:165 #: libraries/config.values.php:175 #: templates/columns_definitions/table_fields_definitions.twig:4 @@ -4715,10 +4721,10 @@ msgstr "Текст OpenDocument" #: 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 @@ -4760,9 +4766,9 @@ msgstr "CSV, используя LOAD DATA" #: libraries/classes/Config/Forms/User/ImportForm.php:67 #: libraries/classes/Controllers/JavaScriptMessagesController.php:310 -#: libraries/classes/Menu.php:288 libraries/classes/Menu.php:394 -#: libraries/classes/Menu.php:523 libraries/classes/Util.php:1967 -#: libraries/classes/Util.php:1982 libraries/classes/Util.php:1999 +#: libraries/classes/Menu.php:289 libraries/classes/Menu.php:395 +#: libraries/classes/Menu.php:524 libraries/classes/Util.php:1968 +#: libraries/classes/Util.php:1983 libraries/classes/Util.php:2000 #: templates/import.twig:3 templates/import.twig:199 #: templates/preferences/header.twig:48 #: templates/preferences/manage/main.twig:11 @@ -4961,6 +4967,37 @@ msgstr "" "%1$sСоздание и распаковка GZip архивов%2$s требует наличия функций (%3$s), " "которые недоступны на данной системе." +#: libraries/classes/ConfigStorage/Relation.php:1432 +msgid "no description" +msgstr "нет описания" + +#: 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 "" +"У вас нет необходимых прав для создания базы данных с именем «%s». Вы можете " +"перейти на вкладку «Операции» любой базы данных, чтобы настроить хранилище " +"конфигурации phpMyAdmin." + +#: libraries/classes/ConfigStorage/UserGroups.php:120 +msgid "View users" +msgstr "Просмотреть пользователей" + +#: libraries/classes/ConfigStorage/UserGroups.php:256 +msgid "Server-level tabs" +msgstr "Вкладки уровня сервера" + +#: libraries/classes/ConfigStorage/UserGroups.php:261 +msgid "Database-level tabs" +msgstr "Вкладки уровня базы данных" + +#: libraries/classes/ConfigStorage/UserGroups.php:266 +msgid "Table-level tabs" +msgstr "Вкладки уровня таблицы" + #: libraries/classes/Config/Validator.php:243 msgid "Could not connect to the database server!" msgstr "Не удалось соединиться с сервером базы данных!" @@ -5029,7 +5066,7 @@ msgstr "Значение должно быть отрицательным чис msgid "Value must be less than or equal to %s!" msgstr "Значение должно быть меньше или равно %s!" -#: libraries/classes/Console.php:90 +#: libraries/classes/Console.php:92 #, php-format msgid "Showing %1$d bookmark (both private and shared)" msgid_plural "Showing %1$d bookmarks (both private and shared)" @@ -5037,11 +5074,11 @@ msgstr[0] "Показать %1$d закладку (как частных, так msgstr[1] "Показать %1$d закладки (как частных, так и общих)" msgstr[2] "Показать %1$d закладок (как частных, так и общих)" -#: libraries/classes/Console.php:97 +#: libraries/classes/Console.php:99 msgid "No bookmarks" msgstr "Нет закладок" -#: libraries/classes/Console.php:129 +#: libraries/classes/Console.php:131 msgid "SQL Query Console" msgstr "Консоль SQL запроса" @@ -5092,7 +5129,7 @@ msgid "Could not load import plugins, please check your installation!" msgstr "Не удалось загрузить плагины импорта. Пожалуйста, проверьте установку!" #: libraries/classes/Controllers/Database/Operations/CollationController.php:48 -#: libraries/classes/Controllers/Table/OperationsController.php:261 +#: libraries/classes/Controllers/Table/OperationsController.php:262 msgid "No collation provided." msgstr "Не предоставлено сопоставление." @@ -5206,7 +5243,7 @@ msgstr "неизвестно" #: libraries/classes/Plugins/Export/ExportTexytext.php:622 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:754 #: templates/config/form_display/input.twig:42 -#: templates/database/central_columns/main.twig:360 +#: templates/database/central_columns/main.twig:356 #: templates/database/data_dictionary/index.twig:47 #: templates/database/data_dictionary/index.twig:91 #: templates/database/designer/main.twig:1117 @@ -5237,7 +5274,7 @@ msgstr "Да" #: libraries/classes/Controllers/Database/Structure/DropTableController.php:57 #: libraries/classes/Controllers/Database/Structure/EmptyTableController.php:73 #: libraries/classes/Controllers/Table/DropColumnController.php:74 -#: libraries/classes/Controllers/Table/OperationsController.php:321 +#: libraries/classes/Controllers/Table/OperationsController.php:322 #: libraries/classes/Controllers/Table/ReplaceController.php:419 #: libraries/classes/Core.php:723 templates/preview_sql.twig:3 msgid "No change" @@ -5617,8 +5654,10 @@ msgid "Do you really want to remove partitioning?" msgstr "Вы действительно хотите удалить выбранный(е) раздел(ы)?" #: libraries/classes/Controllers/JavaScriptMessagesController.php:73 -msgid "Do you really want to RESET SLAVE?" -msgstr "Вы действительно хотите СБРОСИТЬ ПОДЧИНЕННЫЙ СЕРВЕР?" +#, fuzzy +#| msgid "Do you really want to revoke the selected user(s) ?" +msgid "Do you really want to reset the replica (RESET REPLICA)?" +msgstr "Вы действительно хотите отозвать выбранного(ых) пользователя(ей)?" #: libraries/classes/Controllers/JavaScriptMessagesController.php:75 msgid "" @@ -5794,7 +5833,7 @@ msgid "Removing Selected Users" msgstr "Удаление выбранных пользователей" #: libraries/classes/Controllers/JavaScriptMessagesController.php:137 -#: libraries/classes/Tracking.php:237 libraries/classes/Tracking.php:641 +#: libraries/classes/Tracking.php:238 libraries/classes/Tracking.php:642 #: templates/columns_definitions/column_definitions_form.twig:176 #: templates/columns_definitions/column_definitions_form.twig:181 #: templates/error/report_modal.twig:14 templates/export_modal.twig:6 @@ -5887,13 +5926,13 @@ msgstr "Другое" #. l10n: Thousands separator #: libraries/classes/Controllers/JavaScriptMessagesController.php:152 -#: libraries/classes/Util.php:559 libraries/classes/Util.php:591 +#: libraries/classes/Util.php:560 libraries/classes/Util.php:592 msgid "," msgstr " " #. l10n: Decimal separator #: libraries/classes/Controllers/JavaScriptMessagesController.php:154 -#: libraries/classes/Util.php:557 libraries/classes/Util.php:589 +#: libraries/classes/Util.php:558 libraries/classes/Util.php:590 msgid "." msgstr "." @@ -6002,45 +6041,45 @@ msgstr "Процессы" #. l10n: shortcuts for Byte #: libraries/classes/Controllers/JavaScriptMessagesController.php:193 -#: libraries/classes/Util.php:465 +#: libraries/classes/Util.php:466 msgid "B" msgstr "Байт" #. l10n: shortcuts for Kilobyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:194 -#: libraries/classes/Util.php:467 +#: libraries/classes/Util.php:468 #: templates/server/status/monitor/index.twig:186 msgid "KiB" msgstr "КиБ" #. 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 "МБ" #. l10n: shortcuts for Gigabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:196 -#: libraries/classes/Util.php:471 +#: libraries/classes/Util.php:472 msgid "GiB" msgstr "ГиБ" #. l10n: shortcuts for Terabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:197 -#: libraries/classes/Util.php:473 +#: libraries/classes/Util.php:474 msgid "TiB" msgstr "ТБ" #. l10n: shortcuts for Petabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:198 -#: libraries/classes/Util.php:475 +#: libraries/classes/Util.php:476 msgid "PiB" msgstr "ПиБ" #. l10n: shortcuts for Exabyte #: libraries/classes/Controllers/JavaScriptMessagesController.php:199 -#: libraries/classes/Util.php:477 +#: libraries/classes/Util.php:478 msgid "EiB" msgstr "ЭБ" @@ -6060,7 +6099,7 @@ msgid "Traffic" msgstr "Трафик" #: libraries/classes/Controllers/JavaScriptMessagesController.php:205 -#: libraries/classes/Menu.php:528 libraries/classes/Util.php:1968 +#: libraries/classes/Menu.php:529 libraries/classes/Util.php:1969 #: templates/server/status/monitor/index.twig:12 msgid "Settings" msgstr "Настройки" @@ -6081,7 +6120,7 @@ msgstr "Пожалуйста, добавьте в серию хотя бы од #: libraries/config.values.php:111 #: templates/columns_definitions/column_attributes.twig:208 #: templates/columns_definitions/column_attributes.twig:229 -#: templates/database/central_columns/main.twig:309 +#: templates/database/central_columns/main.twig:305 #: templates/database/designer/main.twig:588 templates/export.twig:433 #: templates/server/privileges/privileges_summary.twig:30 #: templates/server/status/monitor/index.twig:211 @@ -6294,9 +6333,9 @@ msgid "Explain output" msgstr "Анализ результатов" #: libraries/classes/Controllers/JavaScriptMessagesController.php:275 -#: libraries/classes/Menu.php:495 +#: libraries/classes/Menu.php:496 #: libraries/classes/Server/Status/Processes.php:138 -#: libraries/classes/Util.php:1964 libraries/config.values.php:157 +#: libraries/classes/Util.php:1965 libraries/config.values.php:157 #: templates/database/events/editor_form.twig:25 #: templates/database/events/index.twig:44 #: templates/database/tracking/tables.twig:17 @@ -6448,7 +6487,7 @@ msgid "No parameters found!" msgstr "Параметры не найдены!" #: libraries/classes/Controllers/JavaScriptMessagesController.php:325 -#: templates/database/central_columns/main.twig:271 +#: templates/database/central_columns/main.twig:269 #: templates/database/designer/main.twig:339 #: templates/database/designer/main.twig:390 #: templates/database/designer/main.twig:668 @@ -6574,7 +6613,7 @@ msgstr "Смена кодировки" #: libraries/classes/Plugins/Export/ExportTexytext.php:622 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:753 #: templates/config/form_display/input.twig:42 -#: templates/database/central_columns/main.twig:360 +#: templates/database/central_columns/main.twig:356 #: templates/database/data_dictionary/index.twig:47 #: templates/database/data_dictionary/index.twig:91 #: templates/database/designer/main.twig:1118 @@ -6681,10 +6720,10 @@ msgstr "Отобразить поле запроса" #: libraries/classes/Controllers/JavaScriptMessagesController.php:389 #: libraries/classes/Display/Results.php:3161 -#: libraries/classes/Tracking.php:260 templates/console/bookmark_content.twig:7 -#: templates/database/central_columns/main.twig:270 -#: templates/database/central_columns/main.twig:384 -#: templates/database/central_columns/main.twig:385 +#: libraries/classes/Tracking.php:261 templates/console/bookmark_content.twig:7 +#: templates/database/central_columns/main.twig:268 +#: templates/database/central_columns/main.twig:380 +#: templates/database/central_columns/main.twig:381 #: templates/database/designer/main.twig:388 #: templates/database/qbe/ins_del_and_or_cell.twig:18 #: templates/database/search/results.twig:43 @@ -6728,7 +6767,7 @@ msgid "Variable %d:" msgstr "Переменная %d:" #: libraries/classes/Controllers/JavaScriptMessagesController.php:399 -#: libraries/classes/Normalization.php:1058 +#: libraries/classes/Normalization.php:1057 msgid "Pick" msgstr "Выбрать" @@ -6763,7 +6802,7 @@ msgid "Primary key added." msgstr "Добавлен первичный ключ." #: libraries/classes/Controllers/JavaScriptMessagesController.php:411 -#: libraries/classes/Normalization.php:283 +#: libraries/classes/Normalization.php:282 msgid "Taking you to next step…" msgstr "Переход к следующему шагу…" @@ -6773,10 +6812,10 @@ msgid "The first step of normalization is complete for table '%s'." msgstr "Первый этап нормализации таблицы '%s' завершён." #: libraries/classes/Controllers/JavaScriptMessagesController.php:413 -#: libraries/classes/Normalization.php:541 -#: libraries/classes/Normalization.php:605 -#: libraries/classes/Normalization.php:702 -#: libraries/classes/Normalization.php:780 +#: libraries/classes/Normalization.php:540 +#: libraries/classes/Normalization.php:604 +#: libraries/classes/Normalization.php:701 +#: libraries/classes/Normalization.php:779 msgid "End of step" msgstr "Конец шага" @@ -6786,7 +6825,7 @@ msgstr "Второй этап нормализации (2NF)" #. l10n: Display text for calendar close link #: libraries/classes/Controllers/JavaScriptMessagesController.php:415 -#: libraries/classes/Normalization.php:376 +#: libraries/classes/Normalization.php:375 #: templates/javascript/variables.twig:15 msgid "Done" msgstr "Готово" @@ -6871,8 +6910,8 @@ msgstr "Не выбраны зависимости!" #: libraries/classes/Controllers/JavaScriptMessagesController.php:441 #: templates/columns_definitions/column_definitions_form.twig:160 #: templates/database/central_columns/edit.twig:22 -#: templates/database/central_columns/main.twig:121 -#: templates/database/central_columns/main.twig:274 +#: templates/database/central_columns/main.twig:119 +#: templates/database/central_columns/main.twig:272 #: templates/server/variables/index.twig:12 #: templates/table/gis_visualization/gis_visualization.twig:40 #: templates/table/insert/actions_panel.twig:7 @@ -6946,7 +6985,7 @@ msgstr "Содержание точки данных" #: libraries/classes/Controllers/JavaScriptMessagesController.php:475 #: libraries/classes/Controllers/JavaScriptMessagesController.php:631 -#: libraries/classes/ErrorHandler.php:420 libraries/classes/InsertEdit.php:2015 +#: libraries/classes/ErrorHandler.php:420 libraries/classes/InsertEdit.php:2016 #: templates/table/index_form.twig:164 templates/table/index_form.twig:200 msgid "Ignore" msgstr "Игнорировать" @@ -7281,7 +7320,7 @@ msgid "Generate password" msgstr "Создать пароль" #: libraries/classes/Controllers/JavaScriptMessagesController.php:592 -#: templates/server/replication/master_add_slave_user.twig:73 +#: templates/server/replication/primary_add_replica_user.twig:73 msgid "Generate" msgstr "Генерировать" @@ -7536,7 +7575,7 @@ msgid "Table %s already exists!" msgstr "Таблица %s уже существует!" #: libraries/classes/Controllers/JavaScriptMessagesController.php:700 -#: libraries/classes/InsertEdit.php:331 +#: libraries/classes/InsertEdit.php:332 #: libraries/classes/Navigation/Nodes/NodeDatabaseChild.php:53 msgid "Hide" msgstr "Скрыть" @@ -7556,17 +7595,17 @@ msgstr "" "AJAX" #: libraries/classes/Controllers/NormalizationController.php:40 -#: libraries/classes/Normalization.php:246 +#: libraries/classes/Normalization.php:245 msgid "Select one…" msgstr "Выберите что-нибудь…" #: libraries/classes/Controllers/NormalizationController.php:41 -#: libraries/classes/Normalization.php:247 +#: libraries/classes/Normalization.php:246 msgid "No such column" msgstr "Нет такого столбца" #: libraries/classes/Controllers/NormalizationController.php:46 -#: libraries/classes/Normalization.php:251 libraries/classes/Types.php:798 +#: libraries/classes/Normalization.php:250 libraries/classes/Types.php:798 msgctxt "string types" msgid "String" msgstr "Символьные" @@ -8296,21 +8335,31 @@ msgid "The number of joins that did a full scan of the first table." msgstr "Количество запросов-объединений с полным сканированием первой таблицы." #: libraries/classes/Controllers/Server/Status/VariablesController.php:479 -msgid "The number of temporary tables currently open by the slave SQL thread." +#, fuzzy +#| msgid "" +#| "The number of temporary tables currently open by the slave SQL thread." +msgid "" +"The number of temporary tables currently open by the replica SQL thread." msgstr "" "Количество открытых подчинённым SQL потоком в настоящий момент временных " "таблиц." #: libraries/classes/Controllers/Server/Status/VariablesController.php:481 +#, fuzzy +#| msgid "" +#| "Total (since startup) number of times the replication slave SQL thread " +#| "has retried transactions." msgid "" -"Total (since startup) number of times the replication slave SQL thread has " +"Total (since startup) number of times the replication replica SQL thread has " "retried transactions." msgstr "" "Количество повторов транзакций репликации подчинённым потоком с момента " "запуска." #: libraries/classes/Controllers/Server/Status/VariablesController.php:483 -msgid "This is ON if this server is a slave that is connected to a master." +#, fuzzy +#| msgid "This is ON if this server is a slave that is connected to a master." +msgid "This is ON if this server is a replica that is connected to a primary." msgstr "" "Присваивается значение ON, если данный сервер - подчинённый, подключенный к " "главному." @@ -8403,7 +8452,7 @@ msgid "The number of threads that are not sleeping." msgstr "Количество процессов, находящихся в активном состоянии." #: libraries/classes/Controllers/Server/UserGroupsFormController.php:46 -#: libraries/classes/Util.php:850 +#: libraries/classes/Util.php:851 msgid "Missing parameter:" msgstr "Отсутствующий параметр:" @@ -8471,7 +8520,7 @@ msgstr "" "скачать, или просмотреть его." #: libraries/classes/Controllers/Sql/SqlController.php:239 -#: libraries/classes/Sql.php:1170 +#: libraries/classes/Sql.php:1172 #, php-format msgid "Bookmark %s has been created." msgstr "Закладка %s создана." @@ -8578,8 +8627,8 @@ msgstr "Слишком большое количество объединени #: libraries/classes/Controllers/Table/GetFieldController.php:86 #: libraries/classes/Database/Routines.php:1242 -#: libraries/classes/Import.php:154 libraries/classes/InsertEdit.php:223 -#: libraries/classes/Sql.php:983 +#: libraries/classes/Import.php:154 libraries/classes/InsertEdit.php:224 +#: libraries/classes/Sql.php:985 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL вернула пустой результат (т.е. ноль строк)." @@ -8591,8 +8640,8 @@ msgstr "MySQL вернула пустой результат (т.е. ноль с msgid "Maintenance operations on multiple tables are disabled." msgstr "" -#: libraries/classes/Controllers/Table/OperationsController.php:108 -#: libraries/classes/Controllers/Table/OperationsController.php:301 +#: libraries/classes/Controllers/Table/OperationsController.php:109 +#: libraries/classes/Controllers/Table/OperationsController.php:302 #: libraries/classes/Controllers/Table/StructureController.php:100 #: libraries/classes/Navigation/Nodes/NodeView.php:28 #: templates/database/structure/show_create.twig:32 @@ -8606,7 +8655,7 @@ msgstr "Представление" #: libraries/classes/Controllers/Table/Partition/TruncateController.php:66 #: libraries/classes/Controllers/View/OperationsController.php:90 #: libraries/classes/Html/Generator.php:875 libraries/classes/Import.php:138 -#: libraries/classes/InsertEdit.php:721 libraries/classes/Message.php:200 +#: libraries/classes/InsertEdit.php:722 libraries/classes/Message.php:200 #: templates/error/generic.twig:37 #: templates/table/structure/display_structure.twig:355 msgid "Error" @@ -8658,7 +8707,7 @@ msgstr "Поля были успешно перемещены." #: libraries/classes/Controllers/Table/Structure/PartitioningController.php:267 #: libraries/classes/Controllers/Table/Structure/SaveController.php:273 -#: libraries/classes/Tracking.php:776 +#: libraries/classes/Tracking.php:777 msgid "Query error" msgstr "Ошибка запроса" @@ -8923,7 +8972,7 @@ msgid "" "Error in processing request: No event with name %1$s found in database %2$s." msgstr "В базе данных %2$s не найдено событие с именем %1$s." -#: libraries/classes/DatabaseInterface.php:1117 +#: libraries/classes/DatabaseInterface.php:1114 #, php-format msgid "" "Unable to use timezone \"%1$s\" for server %2$d. Please check your " @@ -8935,19 +8984,19 @@ msgstr "" "phpMyAdmin в настоящий момент использует часовой пояс, установленный на " "сервере по-умолчанию." -#: libraries/classes/DatabaseInterface.php:1164 +#: libraries/classes/DatabaseInterface.php:1161 msgid "Failed to set configured collation connection!" msgstr "Не удалось установить настроенное соединение для сопоставления!" -#: libraries/classes/DatabaseInterface.php:1896 +#: libraries/classes/DatabaseInterface.php:1875 msgid "Missing connection parameters!" msgstr "Отсутствуют параметры подключения!" -#: libraries/classes/DatabaseInterface.php:1921 +#: libraries/classes/DatabaseInterface.php:1900 msgid "Connection for controluser as defined in your configuration failed." msgstr "Ошибка при указании соединения для controluser в конфигурации." -#: libraries/classes/DatabaseInterface.php:2399 +#: libraries/classes/DatabaseInterface.php:2378 #, php-format msgid "See %sour documentation%s for more information." msgstr "Смотрите %sour documentation%s для дополнительной информации." @@ -8970,23 +9019,23 @@ msgstr "Вставить" msgid "Del" msgstr "Удалить" -#: libraries/classes/Database/Qbe.php:1705 +#: libraries/classes/Database/Qbe.php:1707 msgid "Saved bookmarked search:" msgstr "Закладка поиска:" -#: libraries/classes/Database/Qbe.php:1707 +#: libraries/classes/Database/Qbe.php:1709 msgid "New bookmark" msgstr "Новая закладка" -#: libraries/classes/Database/Qbe.php:1734 +#: libraries/classes/Database/Qbe.php:1736 msgid "Create bookmark" msgstr "Создать закладку" -#: libraries/classes/Database/Qbe.php:1737 +#: libraries/classes/Database/Qbe.php:1739 msgid "Update bookmark" msgstr "Обновить закладку" -#: libraries/classes/Database/Qbe.php:1739 +#: libraries/classes/Database/Qbe.php:1741 msgid "Delete bookmark" msgstr "Удалить закладку" @@ -9235,8 +9284,8 @@ msgid "Full texts" msgstr "Полные тексты" #: libraries/classes/Display/Results.php:1901 -#: libraries/classes/Display/Results.php:1927 libraries/classes/Util.php:2611 -#: libraries/classes/Util.php:2634 libraries/config.values.php:113 +#: libraries/classes/Display/Results.php:1927 libraries/classes/Util.php:2612 +#: libraries/classes/Util.php:2635 libraries/config.values.php:113 #: templates/database/multi_table_query/form.twig:69 #: templates/database/qbe/sort_select_cell.twig:7 #: templates/server/databases/index.twig:111 @@ -9249,8 +9298,8 @@ msgid "Descending" msgstr "По убыванию" #: libraries/classes/Display/Results.php:1909 -#: libraries/classes/Display/Results.php:1919 libraries/classes/Util.php:2603 -#: libraries/classes/Util.php:2626 libraries/config.values.php:112 +#: libraries/classes/Display/Results.php:1919 libraries/classes/Util.php:2604 +#: libraries/classes/Util.php:2627 libraries/config.values.php:112 #: templates/database/multi_table_query/form.twig:68 #: templates/database/qbe/sort_select_cell.twig:5 #: templates/server/databases/index.twig:109 @@ -9291,7 +9340,7 @@ msgstr "%1$d всего, %2$d в запросе" msgid "%d total" msgstr "%d всего" -#: libraries/classes/Display/Results.php:4205 libraries/classes/Sql.php:989 +#: libraries/classes/Display/Results.php:4205 libraries/classes/Sql.php:991 #, php-format msgid "Query took %01.4f seconds." msgstr "Запрос занял %01.4f сек." @@ -9847,7 +9896,7 @@ msgstr "Статический анализ:" msgid "%d errors were found during analysis." msgstr "Найдено %d ошибок при анализе." -#: libraries/classes/Import.php:294 libraries/classes/Sql.php:997 +#: libraries/classes/Import.php:294 libraries/classes/Sql.php:999 msgid "[ROLLBACK occurred.]" msgstr "[Произошел откат.]" @@ -9944,7 +9993,7 @@ msgid "" "removed." msgstr "Индексы %1$s и %2$s равнозначны и один из них может быть удалён." -#: libraries/classes/InsertEdit.php:347 +#: libraries/classes/InsertEdit.php:348 #: libraries/classes/Navigation/Nodes/NodeFunction.php:28 #: templates/database/routines/execute_form.twig:18 #: templates/table/search/index.twig:36 @@ -9952,7 +10001,7 @@ msgstr "Индексы %1$s и %2$s равнозначны и один из ни msgid "Function" msgstr "Функция" -#: libraries/classes/InsertEdit.php:350 +#: libraries/classes/InsertEdit.php:351 #: libraries/classes/Plugins/Export/ExportHtmlword.php:278 #: libraries/classes/Plugins/Export/ExportHtmlword.php:373 #: libraries/classes/Plugins/Export/ExportLatex.php:541 @@ -9966,7 +10015,7 @@ msgstr "Функция" #: templates/columns_definitions/table_fields_definitions.twig:12 #: templates/database/central_columns/edit.twig:9 #: templates/database/central_columns/main.twig:20 -#: templates/database/central_columns/main.twig:226 +#: templates/database/central_columns/main.twig:224 #: templates/database/data_dictionary/index.twig:23 #: templates/database/data_dictionary/index.twig:74 #: templates/database/events/index.twig:45 @@ -9986,12 +10035,12 @@ msgstr "Функция" msgid "Type" msgstr "Тип" -#: libraries/classes/InsertEdit.php:722 templates/import.twig:60 +#: libraries/classes/InsertEdit.php:723 templates/import.twig:60 #: templates/import.twig:85 msgid "The directory you set for upload work cannot be reached." msgstr "Установленный каталог загрузки не доступен." -#: libraries/classes/InsertEdit.php:730 +#: libraries/classes/InsertEdit.php:731 #: templates/database/qbe/ins_del_and_or_cell.twig:24 #: templates/server/privileges/privileges_table.twig:32 #: templates/server/privileges/privileges_table.twig:59 @@ -10001,15 +10050,15 @@ msgstr "Установленный каталог загрузки не дост msgid "Or" msgstr "Или" -#: libraries/classes/InsertEdit.php:731 +#: libraries/classes/InsertEdit.php:732 msgid "web server upload directory:" msgstr "Из каталога загрузки:" -#: libraries/classes/InsertEdit.php:1338 libraries/classes/Sql.php:980 +#: libraries/classes/InsertEdit.php:1339 libraries/classes/Sql.php:982 msgid "Showing SQL query" msgstr "Отображает SQL-запрос" -#: libraries/classes/InsertEdit.php:1362 libraries/classes/Sql.php:960 +#: libraries/classes/InsertEdit.php:1363 libraries/classes/Sql.php:962 #, php-format msgid "Inserted row id: %1$d" msgstr "Идентификатор вставленной строки: %1$d" @@ -10029,9 +10078,9 @@ msgstr "" msgid "%1$s (near <code>%2$s</code>)" msgstr "%1$s (около <code>%2$s</code>)" -#: libraries/classes/Menu.php:242 +#: libraries/classes/Menu.php:243 #: libraries/classes/Navigation/Nodes/NodeTable.php:319 -#: libraries/classes/Util.php:1499 libraries/classes/Util.php:1993 +#: libraries/classes/Util.php:1500 libraries/classes/Util.php:1994 #: libraries/config.values.php:68 libraries/config.values.php:82 #: libraries/config.values.php:183 templates/database/search/results.twig:34 #: templates/database/structure/structure_table_row.twig:43 @@ -10039,10 +10088,10 @@ msgstr "%1$s (около <code>%2$s</code>)" msgid "Browse" msgstr "Обзор" -#: libraries/classes/Menu.php:261 libraries/classes/Menu.php:368 +#: libraries/classes/Menu.php:262 libraries/classes/Menu.php:369 #: libraries/classes/Navigation/Nodes/NodeTable.php:310 -#: libraries/classes/Util.php:1497 libraries/classes/Util.php:1979 -#: libraries/classes/Util.php:1996 libraries/config.values.php:64 +#: libraries/classes/Util.php:1498 libraries/classes/Util.php:1980 +#: libraries/classes/Util.php:1997 libraries/config.values.php:64 #: libraries/config.values.php:78 libraries/config.values.php:169 #: libraries/config.values.php:179 templates/database/routines/index.twig:27 #: templates/database/routines/index.twig:28 @@ -10052,9 +10101,9 @@ msgstr "Обзор" msgid "Search" msgstr "Поиск" -#: libraries/classes/Menu.php:272 +#: libraries/classes/Menu.php:273 #: libraries/classes/Navigation/Nodes/NodeTable.php:313 -#: libraries/classes/Util.php:1498 libraries/classes/Util.php:1997 +#: libraries/classes/Util.php:1499 libraries/classes/Util.php:1998 #: libraries/config.values.php:66 libraries/config.values.php:80 #: libraries/config.values.php:181 #: templates/database/qbe/ins_del_and_or_cell.twig:6 @@ -10063,9 +10112,9 @@ msgstr "Поиск" msgid "Insert" msgstr "Вставить" -#: libraries/classes/Menu.php:298 libraries/classes/Menu.php:408 -#: libraries/classes/Server/Privileges.php:2894 libraries/classes/Util.php:1984 -#: libraries/classes/Util.php:2000 libraries/config.values.php:161 +#: libraries/classes/Menu.php:299 libraries/classes/Menu.php:409 +#: libraries/classes/Server/Privileges.php:2894 libraries/classes/Util.php:1985 +#: libraries/classes/Util.php:2001 libraries/config.values.php:161 #: templates/database/privileges/index.twig:20 #: templates/server/privileges/privileges_summary.twig:15 #: templates/server/sub_page_header.twig:2 @@ -10073,19 +10122,19 @@ msgstr "Вставить" msgid "Privileges" msgstr "Привилегии" -#: libraries/classes/Menu.php:309 libraries/classes/Menu.php:319 -#: libraries/classes/Menu.php:399 libraries/classes/Util.php:1500 -#: libraries/classes/Util.php:1983 libraries/classes/Util.php:2001 +#: libraries/classes/Menu.php:310 libraries/classes/Menu.php:320 +#: libraries/classes/Menu.php:400 libraries/classes/Util.php:1501 +#: libraries/classes/Util.php:1984 libraries/classes/Util.php:2002 #: libraries/config.values.php:171 templates/table/operations/view.twig:8 msgid "Operations" msgstr "Операции" -#: libraries/classes/Menu.php:325 libraries/classes/Menu.php:434 -#: libraries/classes/Util.php:1988 libraries/classes/Util.php:2002 +#: libraries/classes/Menu.php:326 libraries/classes/Menu.php:435 +#: libraries/classes/Util.php:1989 libraries/classes/Util.php:2003 msgid "Tracking" msgstr "Слежение" -#: libraries/classes/Menu.php:332 libraries/classes/Menu.php:427 +#: libraries/classes/Menu.php:333 libraries/classes/Menu.php:428 #: libraries/classes/Navigation/Nodes/NodeTriggerContainer.php:25 #: libraries/classes/Navigation/Nodes/NodeTriggerContainer.php:26 #: libraries/classes/Plugins/Export/ExportHtmlword.php:561 @@ -10094,76 +10143,76 @@ msgstr "Слежение" #: libraries/classes/Plugins/Export/ExportSql.php:2087 #: libraries/classes/Plugins/Export/ExportTexytext.php:544 #: libraries/classes/Plugins/Export/ExportXml.php:120 -#: libraries/classes/Util.php:1987 libraries/classes/Util.php:2003 +#: libraries/classes/Util.php:1988 libraries/classes/Util.php:2004 #: templates/database/triggers/list.twig:3 msgid "Triggers" msgstr "Триггеры" -#: libraries/classes/Menu.php:373 libraries/classes/Menu.php:381 -#: libraries/classes/Menu.php:389 +#: libraries/classes/Menu.php:374 libraries/classes/Menu.php:382 +#: libraries/classes/Menu.php:390 msgid "Database seems to be empty!" msgstr "Пустая база данных!" -#: libraries/classes/Menu.php:376 libraries/classes/Util.php:1980 +#: libraries/classes/Menu.php:377 libraries/classes/Util.php:1981 msgid "Query" msgstr "Запрос по шаблону" -#: libraries/classes/Menu.php:414 libraries/classes/Util.php:1985 +#: libraries/classes/Menu.php:415 libraries/classes/Util.php:1986 #: templates/database/routines/index.twig:3 msgid "Routines" msgstr "Процедуры" -#: libraries/classes/Menu.php:420 +#: libraries/classes/Menu.php:421 #: libraries/classes/Navigation/Nodes/NodeEventContainer.php:25 #: libraries/classes/Navigation/Nodes/NodeEventContainer.php:26 #: libraries/classes/Plugins/Export/ExportSql.php:1006 #: libraries/classes/Plugins/Export/ExportXml.php:100 -#: libraries/classes/Util.php:1986 templates/database/events/index.twig:3 +#: libraries/classes/Util.php:1987 templates/database/events/index.twig:3 msgid "Events" msgstr "События" -#: libraries/classes/Menu.php:441 libraries/classes/Util.php:1989 +#: libraries/classes/Menu.php:442 libraries/classes/Util.php:1990 msgid "Designer" msgstr "Дизайнер" -#: libraries/classes/Menu.php:448 libraries/classes/Util.php:1990 +#: libraries/classes/Menu.php:449 libraries/classes/Util.php:1991 #: templates/database/structure/check_all_tables.twig:32 msgid "Central columns" msgstr "Центральные столбцы" -#: libraries/classes/Menu.php:508 +#: libraries/classes/Menu.php:509 msgid "User accounts" msgstr "Учетные записи пользователей" -#: libraries/classes/Menu.php:543 libraries/classes/Server/Status/Data.php:152 -#: libraries/classes/Util.php:1969 templates/server/binlog/index.twig:3 +#: libraries/classes/Menu.php:544 libraries/classes/Server/Status/Data.php:152 +#: libraries/classes/Util.php:1970 templates/server/binlog/index.twig:3 msgid "Binary log" msgstr "Бинарный журнал" -#: libraries/classes/Menu.php:550 libraries/classes/Server/Status/Data.php:157 -#: libraries/classes/Util.php:1970 +#: libraries/classes/Menu.php:551 libraries/classes/Server/Status/Data.php:157 +#: libraries/classes/Util.php:1971 #: templates/database/structure/body_for_table_summary.twig:11 #: templates/database/structure/table_header.twig:10 #: templates/server/replication/index.twig:5 msgid "Replication" msgstr "Репликация" -#: libraries/classes/Menu.php:556 libraries/classes/Server/Status/Data.php:229 -#: libraries/classes/Util.php:1971 libraries/config.values.php:159 +#: libraries/classes/Menu.php:557 libraries/classes/Server/Status/Data.php:229 +#: libraries/classes/Util.php:1972 libraries/config.values.php:159 #: templates/server/engines/show.twig:18 templates/server/engines/show.twig:21 #: templates/sql/query.twig:191 msgid "Variables" msgstr "Переменные" -#: libraries/classes/Menu.php:561 libraries/classes/Util.php:1972 +#: libraries/classes/Menu.php:562 libraries/classes/Util.php:1973 msgid "Charsets" msgstr "Кодировки" -#: libraries/classes/Menu.php:566 libraries/classes/Util.php:1974 +#: libraries/classes/Menu.php:567 libraries/classes/Util.php:1975 msgid "Engines" msgstr "Типы таблиц" -#: libraries/classes/Menu.php:571 libraries/classes/Util.php:1973 +#: libraries/classes/Menu.php:572 libraries/classes/Util.php:1974 #: templates/server/plugins/index.twig:4 msgid "Plugins" msgstr "Плагины" @@ -10390,23 +10439,23 @@ msgctxt "Create new view" msgid "New" msgstr "Новое" -#: libraries/classes/Normalization.php:224 +#: libraries/classes/Normalization.php:223 msgid "Make all columns atomic" msgstr "Сделать все столбцы 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 "Первый этап нормализации (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 "Этап 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." @@ -10415,12 +10464,12 @@ msgstr "" "столбец? Например: адрес может быть разбит на улицу, город, страну и " "почтовый индекс." -#: libraries/classes/Normalization.php:237 +#: libraries/classes/Normalization.php:236 msgid "Show me the central list of columns that are not already in this table" msgstr "" "Покажите мне центральный список столбцов, которые ещё не в этой таблице" -#: libraries/classes/Normalization.php:239 +#: libraries/classes/Normalization.php:238 msgid "" "Select a column which can be split into more than one (on select of 'no such " "column', it'll move to next step)." @@ -10428,19 +10477,19 @@ msgstr "" "Выберите столбец, который может быть разбит на более чем один (или выберите " "'нет такого столбца' для перехода к следующему шагу)." -#: libraries/classes/Normalization.php:254 +#: libraries/classes/Normalization.php:253 msgid "split into " msgstr "разделить на " -#: libraries/classes/Normalization.php:276 +#: libraries/classes/Normalization.php:275 msgid "Have a primary key" msgstr "Есть первичный ключ" -#: libraries/classes/Normalization.php:282 +#: libraries/classes/Normalization.php:281 msgid "Primary key already exists." msgstr "Ошибка: первичный индекс уже существует." -#: libraries/classes/Normalization.php:287 +#: libraries/classes/Normalization.php:286 msgid "" "There is no primary key; please add one.<br>Hint: A primary key is a column " "(or combination of columns) that uniquely identify all rows." @@ -10449,24 +10498,24 @@ msgstr "" "Первичным ключом является столбец (или сочетание столбцов), однозначно " "определяющий все строки." -#: libraries/classes/Normalization.php:295 +#: libraries/classes/Normalization.php:294 msgid "Add a primary key on existing column(s)" msgstr "Добавить первичный ключ на существующий(ие) столбец(ы)" -#: libraries/classes/Normalization.php:299 +#: libraries/classes/Normalization.php:298 msgid "" "If it's not possible to make existing column combinations as primary key" msgstr "Невозможно сделать существующие комбинации столбцов первичным ключом" -#: libraries/classes/Normalization.php:301 +#: libraries/classes/Normalization.php:300 msgid "+ Add a new primary key column" msgstr "Добавить новый столбец первичного ключа" -#: libraries/classes/Normalization.php:324 +#: libraries/classes/Normalization.php:323 msgid "Remove redundant columns" msgstr "Удалить избыточные столбцы" -#: libraries/classes/Normalization.php:327 +#: libraries/classes/Normalization.php:326 msgid "" "Do you have a group of columns which on combining gives an existing column? " "For example, if you have first_name, last_name and full_name then combining " @@ -10477,7 +10526,7 @@ msgstr "" "объединении first_name и last_name получается full_name, что является " "избыточным." -#: 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'" @@ -10485,19 +10534,19 @@ msgstr "" "Проверьте столбцы, которые являются избыточными, и кликните для удаления. " "Если такого столбца нет, кликните на «Нет избыточного столбца»" -#: libraries/classes/Normalization.php:338 +#: libraries/classes/Normalization.php:337 msgid "Remove selected" msgstr "Удалить выделенное" -#: libraries/classes/Normalization.php:339 +#: libraries/classes/Normalization.php:338 msgid "No redundant column" msgstr "Нет избыточного столбца" -#: libraries/classes/Normalization.php:361 +#: libraries/classes/Normalization.php:360 msgid "Move repeating groups" msgstr "Переместить повторяющиеся группы" -#: libraries/classes/Normalization.php:364 +#: libraries/classes/Normalization.php:363 msgid "" "Do you have a group of two or more columns that are closely related and are " "all repeating the same attribute? For example, a table that holds data on " @@ -10511,7 +10560,7 @@ msgstr "" "которые образуют повторяющуюся группу. В этом случае должна быть создана " "новая таблица (book_id, author)." -#: 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'" @@ -10519,19 +10568,19 @@ msgstr "" "Проверьте столбцы, образующие повторяющуюся группу. Если такой группы нет, " "кликните на 'Нет повторяющейся группы'" -#: libraries/classes/Normalization.php:377 +#: libraries/classes/Normalization.php:376 msgid "No repeating group" msgstr "Нет повторяющейся группы" -#: libraries/classes/Normalization.php:405 +#: libraries/classes/Normalization.php:404 msgid "Step 2." msgstr "Этап 2." -#: libraries/classes/Normalization.php:405 +#: libraries/classes/Normalization.php:404 msgid "Find partial dependencies" msgstr "Найти частичные зависимости" -#: libraries/classes/Normalization.php:426 +#: libraries/classes/Normalization.php:425 #, php-format msgid "" "No partial dependencies possible as no non-primary column exists since " @@ -10540,12 +10589,12 @@ msgstr "" "Невозможны частичные зависимости, т. к. нет столбца вне первичного ключа " "( %1$s )." -#: libraries/classes/Normalization.php:432 -#: libraries/classes/Normalization.php:474 +#: libraries/classes/Normalization.php:431 +#: libraries/classes/Normalization.php:473 msgid "Table is already in second normal form." msgstr "Таблица уже во второй нормальной форме." -#: libraries/classes/Normalization.php:437 +#: libraries/classes/Normalization.php:436 #, php-format msgid "" "The primary key ( %1$s ) consists of more than one column so we need to find " @@ -10554,8 +10603,8 @@ msgstr "" "Первичный ключ (%1$s) состоит из более чем одного столбца, поэтому " "необходимо найти частичные зависимости." -#: libraries/classes/Normalization.php:441 -#: libraries/classes/Normalization.php:877 +#: libraries/classes/Normalization.php:440 +#: libraries/classes/Normalization.php:876 msgid "" "Please answer the following question(s) carefully to obtain a correct " "normalization." @@ -10563,12 +10612,12 @@ msgstr "" "Пожалуйста, ответьте на следующий(ие) вопрос(ы) тщательно, чтобы получить " "правильную нормализацию." -#: libraries/classes/Normalization.php:443 +#: libraries/classes/Normalization.php:442 msgid "+ Show me the possible partial dependencies based on data in the table" msgstr "" "Покажите мне возможные частичные зависимости на основе данных в таблице" -#: libraries/classes/Normalization.php:446 +#: libraries/classes/Normalization.php:445 msgid "" "For each column below, please select the <b>minimal set</b> of columns among " "given set whose values combined together are sufficient to determine the " @@ -10578,13 +10627,13 @@ msgstr "" "столбцов среди данного набора, чьи объединённые вместе значения достаточны " "для определения значения данного столбца." -#: libraries/classes/Normalization.php:459 -#: libraries/classes/Normalization.php:919 +#: libraries/classes/Normalization.php:458 +#: libraries/classes/Normalization.php:918 #, php-format msgid "'%1$s' depends on:" msgstr "'%1$s' зависит от:" -#: libraries/classes/Normalization.php:470 +#: libraries/classes/Normalization.php:469 #, php-format msgid "" "No partial dependencies possible as the primary key ( %1$s ) has just one " @@ -10593,7 +10642,7 @@ msgstr "" "Невозможны частичные зависимости, т. к. первичный ключ ( %1$s ) имеет только " "один столбец." -#: libraries/classes/Normalization.php:498 +#: libraries/classes/Normalization.php:497 #, php-format msgid "" "In order to put the original table '%1$s' into Second normal form we need to " @@ -10602,18 +10651,18 @@ msgstr "" "Для того, чтобы привести исходную таблицу '%1$s' ко второй нормальной форме, " "необходимо создать следующие таблицы:" -#: libraries/classes/Normalization.php:536 +#: libraries/classes/Normalization.php:535 #, php-format msgid "The second step of normalization is complete for table '%1$s'." msgstr "Второй этап нормализации таблицы '%1$s' завершён." -#: libraries/classes/Normalization.php:592 -#: libraries/classes/Normalization.php:767 -#: libraries/classes/Normalization.php:847 +#: libraries/classes/Normalization.php:591 +#: libraries/classes/Normalization.php:766 +#: libraries/classes/Normalization.php:846 msgid "Error in processing!" msgstr "Ошибка при обработке!" -#: libraries/classes/Normalization.php:641 +#: libraries/classes/Normalization.php:640 #, php-format msgid "" "In order to put the original table '%1$s' into Third normal form we need to " @@ -10622,24 +10671,24 @@ msgstr "" "Для того, чтобы привести исходную таблицу '%1$s' к третьей нормальной форме, " "необходимо создать следующие таблицы:" -#: libraries/classes/Normalization.php:698 +#: libraries/classes/Normalization.php:697 msgid "The third step of normalization is complete." msgstr "Третий этап нормализации завершён." -#: libraries/classes/Normalization.php:820 +#: libraries/classes/Normalization.php:819 #, php-format msgid "Selected repeating group has been moved to the table '%s'" msgstr "Выбранная повторяющаяся группа перемещена в таблицу '%s'" -#: libraries/classes/Normalization.php:875 +#: libraries/classes/Normalization.php:874 msgid "Step 3." msgstr "Этап 3." -#: libraries/classes/Normalization.php:875 +#: libraries/classes/Normalization.php:874 msgid "Find transitive dependencies" msgstr "Найти транзитивные зависимости" -#: libraries/classes/Normalization.php:879 +#: libraries/classes/Normalization.php:878 msgid "" "For each column below, please select the <b>minimal set</b> of columns among " "given set whose values combined together are sufficient to determine the " @@ -10651,7 +10700,7 @@ msgstr "" "значение столбца. <br> Примечание: столбец может не иметь транзитивной " "зависимости , в этом случае вам не нужно выбирать." -#: libraries/classes/Normalization.php:933 +#: libraries/classes/Normalization.php:932 msgid "" "No Transitive dependencies possible as the table doesn't have any non " "primary key columns" @@ -10659,27 +10708,27 @@ msgstr "" "Транзитивные зависимости невозможны, т. к. таблица не имеет каких-либо " "столбцов вне первичного ключа" -#: libraries/classes/Normalization.php:936 +#: libraries/classes/Normalization.php:935 msgid "Table is already in Third normal form!" msgstr "Таблица уже в третьей нормальной форме!" -#: libraries/classes/Normalization.php:962 +#: libraries/classes/Normalization.php:961 msgid "Improve table structure (Normalization):" msgstr "Улучшить структуру таблицы (Нормализация):" -#: libraries/classes/Normalization.php:963 +#: libraries/classes/Normalization.php:962 msgid "Select up to what step you want to normalize" msgstr "Выберите до какого этапа вы хотите нормализовать" -#: libraries/classes/Normalization.php:973 +#: libraries/classes/Normalization.php:972 msgid "Second step of normalization (1NF+2NF)" msgstr "Второй этап нормализации (1NF+2NF)" -#: libraries/classes/Normalization.php:978 +#: libraries/classes/Normalization.php:977 msgid "Third step of normalization (1NF+2NF+3NF)" msgstr "Третий этап нормализации (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" @@ -10687,7 +10736,7 @@ msgstr "" "Подсказка: Пожалуйста, следуйте процедуре тщательно, чтобы получить " "правильную нормализацию" -#: libraries/classes/Normalization.php:1054 +#: libraries/classes/Normalization.php:1053 msgid "" "This list is based on a subset of the table's data and is not necessarily " "accurate. " @@ -10695,41 +10744,41 @@ msgstr "" "Этот список основан на подмножестве данных таблицы и необязательно " "достоверен. " -#: libraries/classes/Normalization.php:1069 +#: libraries/classes/Normalization.php:1068 msgid "No partial dependencies found!" msgstr "Частичных зависимостей не найдено!" -#: libraries/classes/Operations.php:554 +#: libraries/classes/Operations.php:555 #: templates/table/structure/display_partitions.twig:84 msgid "Analyze" msgstr "Анализ" -#: libraries/classes/Operations.php:555 +#: libraries/classes/Operations.php:556 #: templates/table/structure/display_partitions.twig:94 msgid "Check" msgstr "Проверка" -#: libraries/classes/Operations.php:556 +#: libraries/classes/Operations.php:557 #: templates/table/structure/display_partitions.twig:104 msgid "Optimize" msgstr "Оптимизация" -#: libraries/classes/Operations.php:557 +#: libraries/classes/Operations.php:558 #: templates/table/structure/display_partitions.twig:114 msgid "Rebuild" msgstr "Перестройка" -#: libraries/classes/Operations.php:558 +#: libraries/classes/Operations.php:559 #: templates/table/structure/display_partitions.twig:124 msgid "Repair" msgstr "Исправление" -#: libraries/classes/Operations.php:559 +#: libraries/classes/Operations.php:560 #: templates/table/structure/display_partitions.twig:134 msgid "Truncate" msgstr "Очистить" -#: libraries/classes/Operations.php:571 templates/database/events/index.twig:19 +#: libraries/classes/Operations.php:572 templates/database/events/index.twig:19 #: templates/database/events/index.twig:20 #: templates/database/events/index.twig:95 #: templates/database/events/index.twig:101 @@ -10755,39 +10804,39 @@ msgstr "Очистить" msgid "Drop" msgstr "Удалить" -#: libraries/classes/Operations.php:573 +#: libraries/classes/Operations.php:574 msgid "Coalesce" msgstr "Объединить" -#: libraries/classes/Operations.php:929 +#: libraries/classes/Operations.php:930 msgid "Can't move table to same one!" msgstr "Не возможно переместить таблицу саму в себя!" -#: libraries/classes/Operations.php:931 +#: libraries/classes/Operations.php:932 msgid "Can't copy table to same one!" msgstr "Невозможно скопировать таблицу саму в себя!" -#: libraries/classes/Operations.php:955 +#: libraries/classes/Operations.php:956 #, php-format msgid "Table %s has been moved to %s. Privileges have been adjusted." msgstr "Таблица %s была перемещена в %s. Привилегии обновлены." -#: libraries/classes/Operations.php:961 +#: libraries/classes/Operations.php:962 #, php-format msgid "Table %s has been copied to %s. Privileges have been adjusted." msgstr "Таблица %s была скопирована в %s. Привилегии обновлены." -#: libraries/classes/Operations.php:968 +#: libraries/classes/Operations.php:969 #, php-format msgid "Table %s has been moved to %s." msgstr "Таблица %s была перемещена в %s." -#: libraries/classes/Operations.php:972 +#: libraries/classes/Operations.php:973 #, php-format msgid "Table %s has been copied to %s." msgstr "Таблица %s была скопирована в %s." -#: libraries/classes/Operations.php:996 +#: libraries/classes/Operations.php:997 msgid "The table name is empty!" msgstr "Не задано имя таблицы!" @@ -10998,7 +11047,7 @@ msgstr "Дамп данных таблицы" #: templates/columns_definitions/table_fields_definitions.twig:30 #: templates/database/central_columns/edit.twig:14 #: templates/database/central_columns/main.twig:40 -#: templates/database/central_columns/main.twig:246 +#: templates/database/central_columns/main.twig:244 #: templates/database/data_dictionary/index.twig:24 #: templates/database/data_dictionary/index.twig:80 templates/indexes.twig:23 #: templates/table/insert/get_head_and_foot_of_insert_row_table.twig:8 @@ -11023,10 +11072,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" @@ -11050,7 +11099,7 @@ msgstr "Ссылки на" #: templates/columns_definitions/table_fields_definitions.twig:9 #: templates/database/central_columns/edit.twig:8 #: templates/database/central_columns/main.twig:16 -#: templates/database/central_columns/main.twig:222 +#: templates/database/central_columns/main.twig:220 #: templates/database/events/index.twig:43 #: templates/database/routines/editor_form.twig:50 #: templates/database/routines/execute_form.twig:15 @@ -11156,8 +11205,8 @@ msgstr "Поместить названия полей в первой стро #: libraries/classes/Plugins/Export/ExportLatex.php:210 #: libraries/classes/Plugins/Export/ExportSql.php:746 #: libraries/classes/Plugins/Export/ExportXml.php:232 -#: templates/server/replication/change_master.twig:22 -#: templates/server/replication/master_add_slave_user.twig:29 +#: templates/server/replication/change_primary.twig:22 +#: templates/server/replication/primary_add_replica_user.twig:29 msgid "Host:" msgstr "Хост:" @@ -11794,7 +11843,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 г., %H:%M" @@ -12013,11 +12062,11 @@ msgstr "" "Обеспечивает аутентификацию с помощью HOTP и TOTP приложений, таких как " "FreeOTP, Google Authenticator или Authy." -#: libraries/classes/Plugins/TwoFactor/Key.php:203 +#: libraries/classes/Plugins/TwoFactor/Key.php:204 msgid "Hardware Security Key (FIDO U2F)" msgstr "Аппаратный ключ безопасности (FIDO U2F)" -#: libraries/classes/Plugins/TwoFactor/Key.php:213 +#: libraries/classes/Plugins/TwoFactor/Key.php:214 #, fuzzy #| msgid "" #| "Provides authentication using hardware security tokens supporting FIDO " @@ -12077,42 +12126,27 @@ msgstr "Пожалуйста, проверьте привилегии катал msgid "Details…" msgstr "Детали…" -#: libraries/classes/RecentFavoriteTable.php:156 +#: libraries/classes/RecentFavoriteTable.php:158 msgid "Could not save recent table!" msgstr "Не удалось сохранить таблицу недавно использованного!" -#: libraries/classes/RecentFavoriteTable.php:160 +#: libraries/classes/RecentFavoriteTable.php:162 msgid "Could not save favorite table!" msgstr "Невозможно записать таблицу избранного!" -#: libraries/classes/RecentFavoriteTable.php:246 +#: libraries/classes/RecentFavoriteTable.php:248 msgid "Recent tables" msgstr "Недавние таблицы" -#: libraries/classes/RecentFavoriteTable.php:248 +#: libraries/classes/RecentFavoriteTable.php:250 msgid "Recent" msgstr "Недавнее" -#: libraries/classes/RecentFavoriteTable.php:252 +#: libraries/classes/RecentFavoriteTable.php:254 msgid "Favorites" msgstr "Избранное" -#: libraries/classes/Relation.php:1427 -msgid "no description" -msgstr "нет описания" - -#: libraries/classes/Relation.php:1628 -#, 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 "" -"У вас нет необходимых прав для создания базы данных с именем «%s». Вы можете " -"перейти на вкладку «Операции» любой базы данных, чтобы настроить хранилище " -"конфигурации phpMyAdmin." - -#: libraries/classes/ReplicationGui.php:439 +#: libraries/classes/ReplicationGui.php:438 msgid "" "Connection to server is disabled, please enable $cfg['AllowArbitraryServer'] " "in phpMyAdmin configuration." @@ -12120,61 +12154,68 @@ msgstr "" "Подключение к серверу отключено, включите $cfg['AllowArbitraryServer'] в " "конфигурации phpMyAdmin." -#: libraries/classes/ReplicationGui.php:450 +#: libraries/classes/ReplicationGui.php:449 msgid "Replication started successfully." msgstr "Репликация началась успешно." -#: libraries/classes/ReplicationGui.php:451 +#: libraries/classes/ReplicationGui.php:450 msgid "Error starting replication." msgstr "Ошибка при начале репликации." -#: libraries/classes/ReplicationGui.php:454 +#: libraries/classes/ReplicationGui.php:453 msgid "Replication stopped successfully." msgstr "Репликация остановлена успешно." -#: libraries/classes/ReplicationGui.php:455 +#: libraries/classes/ReplicationGui.php:454 msgid "Error stopping replication." msgstr "Ошибка при остановке репликации." -#: libraries/classes/ReplicationGui.php:458 +#: libraries/classes/ReplicationGui.php:457 msgid "Replication resetting successfully." msgstr "Репликация сброшена успешно." -#: libraries/classes/ReplicationGui.php:459 +#: libraries/classes/ReplicationGui.php:458 msgid "Error resetting replication." msgstr "Ошибка при сбросе репликации." -#: libraries/classes/ReplicationGui.php:462 +#: libraries/classes/ReplicationGui.php:461 msgid "Success." msgstr "Успех." -#: libraries/classes/ReplicationGui.php:463 +#: libraries/classes/ReplicationGui.php:462 msgid "Error." msgstr "Ошибка." -#: libraries/classes/ReplicationGui.php:511 +#: libraries/classes/ReplicationGui.php:507 msgid "Unknown error" msgstr "Неизвестная ошибка" -#: libraries/classes/ReplicationGui.php:524 -#, php-format -msgid "Unable to connect to master %s." +#: libraries/classes/ReplicationGui.php:520 +#, fuzzy, php-format +#| msgid "Unable to connect to master %s." +msgid "Unable to connect to primary %s." msgstr "Невозможно соединиться с головным сервером %s." -#: libraries/classes/ReplicationGui.php:534 +#: libraries/classes/ReplicationGui.php:530 +#, fuzzy +#| msgid "" +#| "Unable to read master log position. Possible privilege problem on master." msgid "" -"Unable to read master log position. Possible privilege problem on master." +"Unable to read primary log position. Possible privilege problem on primary." msgstr "" "Невозможно прочесть позицию журнала у головного сервера. Вероятно проблема в " "настройке привилегий головного сервера." -#: libraries/classes/ReplicationGui.php:552 -msgid "Unable to change master!" +#: libraries/classes/ReplicationGui.php:548 +#, fuzzy +#| msgid "Unable to change master!" +msgid "Unable to change primary!" msgstr "Невозможно изменить главный сервер!" -#: libraries/classes/ReplicationGui.php:556 -#, php-format -msgid "Master server changed successfully to %s." +#: libraries/classes/ReplicationGui.php:552 +#, fuzzy, php-format +#| msgid "Master server changed successfully to %s." +msgid "Primary server changed successfully to %s." msgstr "Главный сервер успешно изменён на %s." #: libraries/classes/Routing.php:104 @@ -12193,28 +12234,28 @@ msgstr "Ошибка 404! Страница %s не найдена." msgid "Error 405! Request method not allowed." msgstr "Ошибка 405! Метод запроса не разрешен." -#: libraries/classes/SavedSearches.php:245 +#: libraries/classes/SavedSearches.php:247 msgid "Please provide a name for this bookmarked search." msgstr "Для сохранения закладки поиска, пожалуйста, введите имя." -#: libraries/classes/SavedSearches.php:261 +#: libraries/classes/SavedSearches.php:263 msgid "Missing information to save the bookmarked search." msgstr "Отсутствует информация для записи закладки поиска." -#: libraries/classes/SavedSearches.php:284 -#: libraries/classes/SavedSearches.php:321 +#: libraries/classes/SavedSearches.php:286 +#: libraries/classes/SavedSearches.php:323 msgid "An entry with this name already exists." msgstr "Запись с таким именем уже существует." -#: libraries/classes/SavedSearches.php:349 +#: libraries/classes/SavedSearches.php:351 msgid "Missing information to delete the search." msgstr "Отсутствует информация для удаления поиска." -#: libraries/classes/SavedSearches.php:378 +#: libraries/classes/SavedSearches.php:380 msgid "Missing information to load the search." msgstr "Отсутствует информация для загрузки поиска." -#: libraries/classes/SavedSearches.php:400 +#: libraries/classes/SavedSearches.php:402 msgid "Error while loading the search." msgstr "Ошибка при загрузке поиска." @@ -12430,13 +12471,17 @@ msgstr "Разрешает блокировку таблиц для текуще #: libraries/classes/Server/Privileges.php:430 #: templates/server/privileges/privileges_table.twig:694 #: templates/server/privileges/privileges_table.twig:697 -msgid "Needed for the replication slaves." +#, fuzzy +#| msgid "Needed for the replication slaves." +msgid "Needed for the replication replicas." msgstr "Необходимо для подчиненных серверов при репликации." #: libraries/classes/Server/Privileges.php:435 #: templates/server/privileges/privileges_table.twig:681 #: templates/server/privileges/privileges_table.twig:684 -msgid "Allows the user to ask where the slaves / masters are." +#, fuzzy +#| msgid "Allows the user to ask where the slaves / masters are." +msgid "Allows the user to ask where the replicas / primaries are." msgstr "" "Разрешает запрашивать местонахождение головного и подчиненных серверов." @@ -12678,16 +12723,22 @@ msgid "Show open tables" msgstr "Список открытых таблиц" #: libraries/classes/Server/Status/Data.php:193 -msgid "Show slave hosts" +#, fuzzy +#| msgid "Show slave hosts" +msgid "Show replica hosts" msgstr "Информация о подчиненных серверах" #: libraries/classes/Server/Status/Data.php:200 -#: templates/server/replication/master_replication.twig:9 -msgid "Show master status" +#: templates/server/replication/primary_replication.twig:9 +#, fuzzy +#| msgid "Show master status" +msgid "Show primary status" msgstr "Показать состояние головного сервера" #: libraries/classes/Server/Status/Data.php:207 -msgid "Show slave status" +#, fuzzy +#| msgid "Show slave status" +msgid "Show replica status" msgstr "Информация о состоянии сервера репликации" #: libraries/classes/Server/Status/Data.php:215 @@ -12699,9 +12750,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 "Хост" @@ -12713,22 +12764,6 @@ msgstr "Команда" msgid "Progress" msgstr "Прогресс" -#: libraries/classes/Server/UserGroups.php:121 -msgid "View users" -msgstr "Просмотреть пользователей" - -#: libraries/classes/Server/UserGroups.php:257 -msgid "Server-level tabs" -msgstr "Вкладки уровня сервера" - -#: libraries/classes/Server/UserGroups.php:262 -msgid "Database-level tabs" -msgstr "Вкладки уровня базы данных" - -#: libraries/classes/Server/UserGroups.php:267 -msgid "Table-level tabs" -msgstr "Вкладки уровня таблицы" - #: libraries/classes/Setup/Index.php:130 msgid "" "Reading of version failed. Maybe you're offline or the upgrade server does " @@ -12758,16 +12793,16 @@ msgstr "" msgid "No newer stable version is available" msgstr "Обновление стабильной версии недоступно" -#: libraries/classes/Sql.php:500 +#: libraries/classes/Sql.php:502 #, php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "Для обзора данных использован запрос из закладки \"%s\"." -#: libraries/classes/Sql.php:977 +#: libraries/classes/Sql.php:979 msgid "Showing as PHP code" msgstr "Отображает как PHP-код" -#: libraries/classes/Sql.php:1343 +#: libraries/classes/Sql.php:1345 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " @@ -12776,7 +12811,7 @@ msgstr "" "Данное выделение не содержит уникального столбца. Изменение сетки, " "выставление галочки, редактирование, копирование и удаление невозможно. %s" -#: libraries/classes/Sql.php:1357 +#: libraries/classes/Sql.php:1359 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, Edit, Copy " @@ -12828,7 +12863,7 @@ msgstr "Тип таблиц %s был отключен на данном MySQL msgid "This MySQL server does not support the %s storage engine." msgstr "Данный сервер MySQL не поддерживает тип таблиц %s." -#: libraries/classes/Table/Indexes.php:58 libraries/classes/Table.php:2143 +#: libraries/classes/Table/Indexes.php:58 libraries/classes/Table.php:2106 msgid "The name of the primary key must be \"PRIMARY\"!" msgstr "Имя первичного индекса должно быть \"PRIMARY\"!" @@ -12837,43 +12872,43 @@ msgstr "Имя первичного индекса должно быть \"PRIMA msgid "Problems with indexes of table `%s`" msgstr "Проблемы с индексами таблицы `%s`" -#: libraries/classes/Table.php:343 +#: libraries/classes/Table.php:345 msgid "Unknown table status:" msgstr "Неизвестный статус таблицы:" -#: libraries/classes/Table.php:1006 +#: libraries/classes/Table.php:1008 #, php-format msgid "Source database `%s` was not found!" msgstr "База данных `%s`, являющаяся источником, не найдена!" -#: libraries/classes/Table.php:1015 +#: libraries/classes/Table.php:1017 #, php-format msgid "Target database `%s` was not found!" msgstr "База данных `%s`, являющаяся целевой, не найдена!" -#: libraries/classes/Table.php:1513 +#: libraries/classes/Table.php:1476 msgid "Invalid database:" msgstr "Некорректная база данных:" -#: libraries/classes/Table.php:1531 +#: libraries/classes/Table.php:1494 msgid "Invalid table name:" msgstr "Некорректное имя таблицы:" -#: libraries/classes/Table.php:1570 +#: libraries/classes/Table.php:1533 #, php-format msgid "Failed to rename table %1$s to %2$s!" msgstr "Не удалось переименовать таблицу %1$s в %2$s!" -#: libraries/classes/Table.php:1587 +#: libraries/classes/Table.php:1550 #, php-format msgid "Table %1$s has been renamed to %2$s." msgstr "Таблица %1$s была переименована в %2$s." -#: libraries/classes/Table.php:1829 +#: libraries/classes/Table.php:1792 msgid "Could not save table UI preferences!" msgstr "Не удалось сохранить настройки пользовательского интерфейса!" -#: libraries/classes/Table.php:1857 +#: libraries/classes/Table.php:1820 #, php-format msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" @@ -12882,7 +12917,7 @@ msgstr "" "Ошибка при очистке таблицы содержащей настройки пользовательского интерфейса " "(смотрите переменную $cfg['Servers'][$i]['MaxTableUiprefs'] %s)" -#: libraries/classes/Table.php:1994 +#: libraries/classes/Table.php:1957 #, php-format msgid "" "Cannot save UI property \"%s\". The changes made will not be persistent " @@ -12893,15 +12928,15 @@ msgstr "" "перезагрузки страницы, изменения интерфейса будут отменены. Пожалуйста, " "проверьте изменена ли структура таблицы." -#: libraries/classes/Table.php:2155 +#: libraries/classes/Table.php:2118 msgid "Can't rename index to PRIMARY!" msgstr "Невозможно переименовать индекс в PRIMARY!" -#: libraries/classes/Table.php:2181 +#: libraries/classes/Table.php:2144 msgid "No index parts defined!" msgstr "Части индекса не определены!" -#: libraries/classes/Table.php:2478 +#: libraries/classes/Table.php:2441 #, php-format msgid "Error creating foreign key on %1$s (check data types)" msgstr "Ошибка создания внешнего ключа на %1$s (проверьте типы данных)" @@ -12926,99 +12961,99 @@ msgstr "Тема %s не найдена!" msgid "No valid image path for theme %s found!" msgstr "Не найден правильный путь к изображениям для темы %s!" -#: libraries/classes/Tracking.php:236 +#: libraries/classes/Tracking.php:237 #: templates/database/tracking/tables.twig:115 #: templates/table/tracking/main.twig:73 msgid "Tracking report" msgstr "Отчёт слежения" -#: libraries/classes/Tracking.php:240 +#: libraries/classes/Tracking.php:241 msgid "Tracking statements" msgstr "Отслеживаемые выражения" -#: libraries/classes/Tracking.php:255 +#: libraries/classes/Tracking.php:256 msgid "Delete tracking data row from report" msgstr "Удалить строку данных слежения за таблицей" -#: libraries/classes/Tracking.php:267 +#: libraries/classes/Tracking.php:268 msgid "No data" msgstr "Нет данных" -#: libraries/classes/Tracking.php:312 +#: libraries/classes/Tracking.php:313 #: templates/database/operations/index.twig:130 #: templates/database/structure/copy_form.twig:19 #: templates/table/operations/index.twig:275 msgid "Structure only" msgstr "Только структура" -#: libraries/classes/Tracking.php:315 +#: libraries/classes/Tracking.php:316 #: templates/database/operations/index.twig:142 #: templates/database/structure/copy_form.twig:29 #: templates/table/operations/index.twig:287 msgid "Data only" msgstr "Только данные" -#: libraries/classes/Tracking.php:318 +#: libraries/classes/Tracking.php:319 #: templates/database/operations/index.twig:136 #: templates/database/structure/copy_form.twig:24 #: templates/table/operations/index.twig:281 msgid "Structure and data" msgstr "Структура и данные" -#: libraries/classes/Tracking.php:383 libraries/classes/Tracking.php:451 +#: libraries/classes/Tracking.php:384 libraries/classes/Tracking.php:452 #, php-format msgid "Show %1$s with dates from %2$s to %3$s by user %4$s %5$s" msgstr "Вывести %1$s с датой от %2$s до %3$s пользователя %4$s %5$s" -#: libraries/classes/Tracking.php:472 +#: libraries/classes/Tracking.php:473 msgid "SQL dump (file download)" msgstr "Выгрузка SQL (файл)" -#: libraries/classes/Tracking.php:474 +#: libraries/classes/Tracking.php:475 msgid "SQL dump" msgstr "Выгрузка SQL" -#: libraries/classes/Tracking.php:477 +#: libraries/classes/Tracking.php:478 msgid "This option will replace your table and contained data." msgstr "Данный параметр заместит таблицу и содержащиеся в ней данные." -#: libraries/classes/Tracking.php:479 +#: libraries/classes/Tracking.php:480 msgid "SQL execution" msgstr "Выполнение SQL запроса" -#: libraries/classes/Tracking.php:483 +#: libraries/classes/Tracking.php:484 #, php-format msgid "Export as %s" msgstr "Экспортировать как %s" -#: libraries/classes/Tracking.php:521 +#: libraries/classes/Tracking.php:522 msgid "Data manipulation statement" msgstr "Выражение изменяющее данные" -#: libraries/classes/Tracking.php:557 +#: libraries/classes/Tracking.php:558 msgid "Data definition statement" msgstr "Выражение определяющее структуру" -#: libraries/classes/Tracking.php:640 +#: libraries/classes/Tracking.php:641 #: templates/database/tracking/tables.twig:126 #: templates/table/tracking/main.twig:80 msgid "Structure snapshot" msgstr "Снимок структуры" -#: libraries/classes/Tracking.php:658 +#: libraries/classes/Tracking.php:659 #, php-format msgid "Version %s snapshot (SQL code)" msgstr "Обзор версии %s (SQL код)" -#: libraries/classes/Tracking.php:728 +#: libraries/classes/Tracking.php:729 msgid "Tracking data definition successfully deleted" msgstr "Данные слежения успешно удалены" -#: libraries/classes/Tracking.php:740 +#: libraries/classes/Tracking.php:741 msgid "Tracking data manipulation successfully deleted" msgstr "Данные слежения успешно удалены" -#: libraries/classes/Tracking.php:797 +#: libraries/classes/Tracking.php:798 msgid "" "You can execute the dump by creating and using a temporary database. Please " "ensure that you have the privileges to do so." @@ -13027,35 +13062,35 @@ msgstr "" "временную базу данных. Убедитесь, что у вас есть для этого достаточные " "привилегии." -#: libraries/classes/Tracking.php:801 +#: libraries/classes/Tracking.php:802 msgid "Comment out these two lines if you do not need them." msgstr "Закомментируйте эти две строки, если они вам не нужны." -#: libraries/classes/Tracking.php:812 +#: libraries/classes/Tracking.php:813 msgid "SQL statements exported. Please copy the dump or execute it." msgstr "SQL выражения успешно выгружены; скопируйте, либо выполните их." -#: libraries/classes/Tracking.php:850 +#: libraries/classes/Tracking.php:851 #, php-format msgid "Tracking report for table `%s`" msgstr "Отчёт слежения для таблицы `%s`" -#: libraries/classes/Tracking.php:882 +#: libraries/classes/Tracking.php:883 #, php-format msgid "Tracking for %1$s was activated at version %2$s." msgstr "Слежение за %1$s было включено на версии %2$s." -#: libraries/classes/Tracking.php:885 +#: libraries/classes/Tracking.php:886 #, php-format msgid "Tracking for %1$s was deactivated at version %2$s." msgstr "Слежение за %1$s было выключено на версии %2$s." -#: libraries/classes/Tracking.php:984 +#: libraries/classes/Tracking.php:985 #, php-format msgid "Version %1$s of %2$s was deleted." msgstr "Версия %1$s из %2$s удалена." -#: libraries/classes/Tracking.php:1015 +#: libraries/classes/Tracking.php:1016 #, php-format msgid "Version %1$s was created, tracking for %2$s is active." msgstr "Версия %1$s создана, отслеживание %2$s включено." @@ -13371,89 +13406,89 @@ msgstr "Профиль был обновлен." msgid "Password is too long!" msgstr "Пароль слишком длинный!" -#: libraries/classes/UserPreferences.php:166 +#: libraries/classes/UserPreferences.php:167 msgid "Could not save configuration" msgstr "Не получилось сохранить настройки" -#: libraries/classes/Util.php:132 +#: libraries/classes/Util.php:133 #, php-format msgid "Max: %s%s" msgstr "Максимальный размер: %s%s" #. l10n: Short month name #. l10n: Short month name for January -#: libraries/classes/Util.php:677 templates/javascript/variables.twig:34 +#: libraries/classes/Util.php:678 templates/javascript/variables.twig:34 msgid "Jan" msgstr "Янв" #. l10n: Short month name #. l10n: Short month name for February -#: libraries/classes/Util.php:679 templates/javascript/variables.twig:35 +#: libraries/classes/Util.php:680 templates/javascript/variables.twig:35 msgid "Feb" msgstr "Фев" #. l10n: Short month name #. l10n: Short month name for March -#: libraries/classes/Util.php:681 templates/javascript/variables.twig:36 +#: libraries/classes/Util.php:682 templates/javascript/variables.twig:36 msgid "Mar" msgstr "Мар" #. l10n: Short month name #. l10n: Short month name for April -#: libraries/classes/Util.php:683 templates/javascript/variables.twig:37 +#: libraries/classes/Util.php:684 templates/javascript/variables.twig:37 msgid "Apr" msgstr "Апр" #. l10n: Short month name -#: libraries/classes/Util.php:685 +#: libraries/classes/Util.php:686 msgctxt "Short month name" msgid "May" msgstr "Май" #. l10n: Short month name #. l10n: Short month name for June -#: libraries/classes/Util.php:687 templates/javascript/variables.twig:39 +#: libraries/classes/Util.php:688 templates/javascript/variables.twig:39 msgid "Jun" msgstr "Июн" #. l10n: Short month name #. l10n: Short month name for July -#: libraries/classes/Util.php:689 templates/javascript/variables.twig:40 +#: libraries/classes/Util.php:690 templates/javascript/variables.twig:40 msgid "Jul" msgstr "Июл" #. l10n: Short month name #. l10n: Short month name for August -#: libraries/classes/Util.php:691 templates/javascript/variables.twig:41 +#: libraries/classes/Util.php:692 templates/javascript/variables.twig:41 msgid "Aug" msgstr "Авг" #. l10n: Short month name #. l10n: Short month name for September -#: libraries/classes/Util.php:693 templates/javascript/variables.twig:42 +#: libraries/classes/Util.php:694 templates/javascript/variables.twig:42 msgid "Sep" msgstr "Сен" #. l10n: Short month name #. l10n: Short month name for October -#: libraries/classes/Util.php:695 templates/javascript/variables.twig:43 +#: libraries/classes/Util.php:696 templates/javascript/variables.twig:43 msgid "Oct" msgstr "Окт" #. l10n: Short month name #. l10n: Short month name for November -#: libraries/classes/Util.php:697 templates/javascript/variables.twig:44 +#: libraries/classes/Util.php:698 templates/javascript/variables.twig:44 msgid "Nov" msgstr "Ноя" #. l10n: Short month name #. l10n: Short month name for December -#: libraries/classes/Util.php:699 templates/javascript/variables.twig:45 +#: libraries/classes/Util.php:700 templates/javascript/variables.twig:45 msgid "Dec" msgstr "Дек" #. l10n: Short week day name for Sunday -#: libraries/classes/Util.php:703 +#: libraries/classes/Util.php:704 #, fuzzy #| msgid "Sun" msgctxt "Short week day name for Sunday" @@ -13461,55 +13496,55 @@ msgid "Sun" msgstr "Вс" #. l10n: Short week day name for Monday -#: libraries/classes/Util.php:705 templates/javascript/variables.twig:58 +#: libraries/classes/Util.php:706 templates/javascript/variables.twig:58 msgid "Mon" msgstr "Пн" #. l10n: Short week day name for Tuesday -#: libraries/classes/Util.php:707 templates/javascript/variables.twig:59 +#: libraries/classes/Util.php:708 templates/javascript/variables.twig:59 msgid "Tue" msgstr "Вт" #. l10n: Short week day name for Wednesday -#: libraries/classes/Util.php:709 templates/javascript/variables.twig:60 +#: libraries/classes/Util.php:710 templates/javascript/variables.twig:60 msgid "Wed" msgstr "Ср" #. l10n: Short week day name for Thursday -#: libraries/classes/Util.php:711 templates/javascript/variables.twig:61 +#: libraries/classes/Util.php:712 templates/javascript/variables.twig:61 msgid "Thu" msgstr "Чт" #. l10n: Short week day name for Friday -#: libraries/classes/Util.php:713 templates/javascript/variables.twig:62 +#: libraries/classes/Util.php:714 templates/javascript/variables.twig:62 msgid "Fri" msgstr "Пт" #. l10n: Short week day name for Saturday -#: libraries/classes/Util.php:715 templates/javascript/variables.twig:63 +#: libraries/classes/Util.php:716 templates/javascript/variables.twig:63 msgid "Sat" msgstr "Сб" -#: libraries/classes/Util.php:741 +#: libraries/classes/Util.php:742 msgctxt "AM/PM indication in time" msgid "PM" msgstr "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 дней, %s часов, %s минут и %s секунд" -#: libraries/classes/Util.php:1965 +#: libraries/classes/Util.php:1966 msgid "Users" msgstr "Пользователи" -#: libraries/classes/Util.php:2595 +#: libraries/classes/Util.php:2596 #: templates/database/multi_table_query/form.twig:67 msgid "Sort" msgstr "Отсортировать" @@ -13697,23 +13732,23 @@ msgstr "Неверные данные или отсутствие проверк #: templates/columns_definitions/column_attributes.twig:31 #: templates/database/central_columns/edit_table_row.twig:23 -#: templates/database/central_columns/main.twig:73 -#: templates/database/central_columns/main.twig:302 +#: templates/database/central_columns/main.twig:71 +#: templates/database/central_columns/main.twig:298 msgid "Edit ENUM/SET values" msgstr "Редактировать ENUM/SET значения" #: templates/columns_definitions/column_attributes.twig:38 #: templates/database/central_columns/edit_table_row.twig:30 -#: templates/database/central_columns/main.twig:78 -#: templates/database/central_columns/main.twig:313 +#: templates/database/central_columns/main.twig:76 +#: templates/database/central_columns/main.twig:309 msgctxt "for default" msgid "None" msgstr "Нет" #: templates/columns_definitions/column_attributes.twig:41 #: templates/database/central_columns/edit_table_row.twig:33 -#: templates/database/central_columns/main.twig:79 -#: templates/database/central_columns/main.twig:316 +#: templates/database/central_columns/main.twig:77 +#: templates/database/central_columns/main.twig:312 msgid "As defined:" msgstr "Как определено:" @@ -13772,7 +13807,7 @@ msgstr "Имя таблицы" #: templates/columns_definitions/column_definitions_form.twig:32 #: templates/console/display.twig:99 -#: templates/database/central_columns/main.twig:198 templates/export.twig:285 +#: templates/database/central_columns/main.twig:196 templates/export.twig:285 #: templates/export.twig:301 templates/export.twig:317 msgid "Add" msgstr "Добавить" @@ -13952,7 +13987,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 @@ -14210,52 +14245,52 @@ msgid "Add new column" msgstr "Добавить столбец" #: templates/database/central_columns/main.twig:24 -#: templates/database/central_columns/main.twig:230 +#: templates/database/central_columns/main.twig:228 msgid "Length/Value" msgstr "Длина/Значение" #: templates/database/central_columns/main.twig:36 -#: templates/database/central_columns/main.twig:242 +#: templates/database/central_columns/main.twig:240 msgid "Attribute" msgstr "Атрибут" #: templates/database/central_columns/main.twig:44 -#: templates/database/central_columns/main.twig:250 +#: templates/database/central_columns/main.twig:248 msgid "A_I" msgstr "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 "Центральный список столбцов для текущей базы данных пуст" -#: templates/database/central_columns/main.twig:168 +#: templates/database/central_columns/main.twig:166 #: templates/display/results/table.twig:62 msgid "Filter rows" msgstr "Фильтровать строки" -#: templates/database/central_columns/main.twig:169 +#: templates/database/central_columns/main.twig:167 #: templates/display/results/table.twig:64 msgid "Search this table" msgstr "Поиск в таблице" -#: templates/database/central_columns/main.twig:180 +#: templates/database/central_columns/main.twig:178 #: templates/table/structure/display_structure.twig:417 msgid "Add column" msgstr "Добавить столбец" -#: templates/database/central_columns/main.twig:189 +#: templates/database/central_columns/main.twig:187 msgid "Select a table" msgstr "Выберите таблицу" -#: templates/database/central_columns/main.twig:196 +#: templates/database/central_columns/main.twig:194 msgid "Select a column." msgstr "Выберите столбец." -#: templates/database/central_columns/main.twig:215 +#: templates/database/central_columns/main.twig:213 msgid "Click to sort." msgstr "Нажмите для сортировки." -#: templates/database/central_columns/main.twig:220 +#: templates/database/central_columns/main.twig:218 #: templates/database/privileges/index.twig:22 #: templates/database/structure/table_header.twig:22 #: templates/database/tracking/tables.twig:18 @@ -14830,9 +14865,9 @@ msgstr "Пользователи с правами доступа к \"%s\"" #: templates/server/privileges/login_information_fields.twig:6 #: templates/server/privileges/login_information_fields.twig:11 #: templates/server/privileges/users_overview.twig:8 -#: templates/server/replication/change_master.twig:15 -#: templates/server/replication/master_add_slave_user.twig:19 -#: templates/server/replication/master_add_slave_user.twig:24 +#: templates/server/replication/change_primary.twig:15 +#: templates/server/replication/primary_add_replica_user.twig:19 +#: templates/server/replication/primary_add_replica_user.twig:24 #: templates/table/privileges/index.twig:19 msgid "User name" msgstr "Имя пользователя" @@ -16364,8 +16399,8 @@ msgstr "Пользователь:" #: templates/login/form.twig:85 #: templates/server/privileges/change_password.twig:21 #: templates/server/privileges/login_information_fields.twig:43 -#: templates/server/replication/change_master.twig:18 -#: templates/server/replication/master_add_slave_user.twig:49 +#: templates/server/replication/change_primary.twig:18 +#: templates/server/replication/primary_add_replica_user.twig:49 msgid "Password:" msgstr "Пароль:" @@ -16956,7 +16991,7 @@ msgid "Position" msgstr "Позиция" #: templates/server/binlog/index.twig:87 -#: templates/server/replication/master_replication.twig:24 +#: templates/server/replication/primary_replication.twig:24 msgid "Server ID" msgstr "ID сервера" @@ -16994,13 +17029,17 @@ msgstr "Нет привилегий для создания баз данных" #: templates/server/databases/index.twig:156 #: templates/server/replication/index.twig:18 -#: templates/server/replication/master_replication.twig:3 -msgid "Master replication" +#: templates/server/replication/primary_replication.twig:3 +#, fuzzy +#| msgid "Master replication" +msgid "Primary replication" msgstr "Репликация головного сервера" #: templates/server/databases/index.twig:160 -#: templates/server/replication/slave_configuration.twig:2 -msgid "Slave replication" +#: templates/server/replication/replica_configuration.twig:2 +#, fuzzy +#| msgid "Slave replication" +msgid "Replica replication" msgstr "Репликация подчинённого сервера" #: templates/server/databases/index.twig:181 @@ -17122,7 +17161,7 @@ msgstr "Стойкость:" #: templates/server/privileges/change_password.twig:32 #: templates/server/privileges/login_information_fields.twig:60 -#: templates/server/replication/master_add_slave_user.twig:62 +#: templates/server/replication/primary_add_replica_user.twig:62 msgid "Re-type:" msgstr "Подтверждение:" @@ -17202,13 +17241,13 @@ msgid "Login Information" msgstr "Информация учётной записи" #: templates/server/privileges/login_information_fields.twig:4 -#: templates/server/replication/change_master.twig:14 -#: templates/server/replication/master_add_slave_user.twig:16 +#: templates/server/replication/change_primary.twig:14 +#: templates/server/replication/primary_add_replica_user.twig:16 msgid "User name:" msgstr "Имя пользователя:" #: templates/server/privileges/login_information_fields.twig:7 -#: templates/server/replication/master_add_slave_user.twig:20 +#: templates/server/replication/primary_add_replica_user.twig:20 msgid "Any user" msgstr "Любой пользователь" @@ -17233,27 +17272,27 @@ msgid "Host name:" msgstr "Имя хоста:" #: templates/server/privileges/login_information_fields.twig:27 -#: templates/server/replication/master_add_slave_user.twig:34 +#: templates/server/replication/primary_add_replica_user.twig:34 msgid "Any host" msgstr "Любой хост" #: templates/server/privileges/login_information_fields.twig:28 -#: templates/server/replication/master_add_slave_user.twig:35 +#: templates/server/replication/primary_add_replica_user.twig:35 msgid "Local" msgstr "Локальный" #: templates/server/privileges/login_information_fields.twig:30 -#: templates/server/replication/master_add_slave_user.twig:37 +#: templates/server/replication/primary_add_replica_user.twig:37 msgid "This host" msgstr "Этот хост" #: templates/server/privileges/login_information_fields.twig:32 -#: templates/server/replication/master_add_slave_user.twig:39 +#: templates/server/replication/primary_add_replica_user.twig:39 msgid "Use host table" msgstr "Использовать таблицу хостов" #: templates/server/privileges/login_information_fields.twig:39 -#: templates/server/replication/master_add_slave_user.twig:44 +#: templates/server/replication/primary_add_replica_user.twig:44 msgid "" "When Host table is used, this field is ignored and values stored in Host " "table are used instead." @@ -17264,9 +17303,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 "Пароль" @@ -17275,12 +17314,12 @@ msgid "Do not change the password" msgstr "Не менять пароль" #: templates/server/privileges/login_information_fields.twig:49 -#: templates/server/replication/master_add_slave_user.twig:53 +#: templates/server/replication/primary_add_replica_user.twig:53 msgid "No password" msgstr "Без пароля" #: templates/server/privileges/login_information_fields.twig:62 -#: templates/server/replication/master_add_slave_user.twig:65 +#: templates/server/replication/primary_add_replica_user.twig:65 msgid "Re-type" msgstr "Подтверждение" @@ -17521,16 +17560,20 @@ msgstr "Удалить базы данных, имена которых совп msgid "Save changes" msgstr "Сохранить страницу" -#: templates/server/replication/change_master.twig:5 -msgid "Slave configuration" +#: templates/server/replication/change_primary.twig:5 +#, fuzzy +#| msgid "Slave configuration" +msgid "Replica configuration" msgstr "Настройка подчиненного сервера" -#: templates/server/replication/change_master.twig:6 -#: templates/server/replication/slave_configuration.twig:97 -msgid "Change or reconfigure master server" +#: templates/server/replication/change_primary.twig:6 +#: templates/server/replication/replica_configuration.twig:97 +#, fuzzy +#| msgid "Change or reconfigure master server" +msgid "Change or reconfigure primary server" msgstr "Изменить, или перенастроить головной сервер" -#: templates/server/replication/change_master.twig:9 +#: templates/server/replication/change_primary.twig:9 msgid "" "Make sure you have a unique server-id in your configuration file (my.cnf). " "If not, please add the following line into [mysqld] section:" @@ -17538,14 +17581,17 @@ msgstr "" "Убедитесь, что в конфигурационном файле (my.cnf) имеется уникальное значение " "server-id. При необходимости, добавьте следующую строку в раздел [mysqld]:" -#: templates/server/replication/change_master.twig:26 +#: templates/server/replication/change_primary.twig:26 msgid "Port:" msgstr "Порт:" #: templates/server/replication/index.twig:21 -#, php-format +#, fuzzy, php-format +#| msgid "" +#| "This server is not configured as master in a replication process. Would " +#| "you like to %sconfigure%s it?" msgid "" -"This server is not configured as master in a replication process. Would you " +"This server is not configured as primary in a replication process. Would you " "like to %sconfigure%s it?" msgstr "" "Данный сервер не настроен в качестве ведущего для процесса репликации. " @@ -17555,28 +17601,39 @@ msgstr "" msgid "No privileges" msgstr "Нет привилегий" -#: templates/server/replication/master_add_slave_user.twig:6 -#: templates/server/replication/master_replication.twig:44 -msgid "Add slave replication user" +#: templates/server/replication/primary_add_replica_user.twig:6 +#: templates/server/replication/primary_replication.twig:44 +#, fuzzy +#| msgid "Add slave replication user" +msgid "Add replica replication user" msgstr "Добавьте подчиненного пользователя репликации" -#: templates/server/replication/master_add_slave_user.twig:21 -#: templates/server/replication/master_add_slave_user.twig:40 -#: templates/server/replication/master_add_slave_user.twig:54 +#: templates/server/replication/primary_add_replica_user.twig:21 +#: templates/server/replication/primary_add_replica_user.twig:40 +#: templates/server/replication/primary_add_replica_user.twig:54 msgid "Use text field:" msgstr "Использовать текстовое поле:" -#: templates/server/replication/master_add_slave_user.twig:70 +#: templates/server/replication/primary_add_replica_user.twig:70 msgid "Generate password:" msgstr "Создать пароль:" -#: templates/server/replication/master_configuration.twig:2 -msgid "Master configuration" -msgstr "Настройка головного сервера" +#: templates/server/replication/primary_configuration.twig:2 +#, fuzzy +#| msgid "Server configuration" +msgid "Primary configuration" +msgstr "Параметры сервера" -#: templates/server/replication/master_configuration.twig:4 +#: templates/server/replication/primary_configuration.twig:4 +#, fuzzy +#| msgid "" +#| "This server is not configured as a master server in a replication " +#| "process. You can choose from either replicating all databases and " +#| "ignoring some of them (useful if you want to replicate a majority of the " +#| "databases) or you can choose to ignore all databases by default and allow " +#| "only certain databases to be replicated. Please select the mode:" msgid "" -"This server is not configured as a master server in a replication process. " +"This server is not configured as a primary server in a replication process. " "You can choose from either replicating all databases and ignoring some of " "them (useful if you want to replicate a majority of the databases) or you " "can choose to ignore all databases by default and allow only certain " @@ -17588,19 +17645,19 @@ msgstr "" "выбрать игнорирование всех баз данных по умолчанию и разрешение для " "репликации только определенных. Пожалуйста, выберите желаемый режим:" -#: templates/server/replication/master_configuration.twig:9 +#: templates/server/replication/primary_configuration.twig:9 msgid "Replicate all databases; Ignore:" msgstr "Репликация всех баз данных; игнорировать:" -#: templates/server/replication/master_configuration.twig:10 +#: templates/server/replication/primary_configuration.twig:10 msgid "Ignore all databases; Replicate:" msgstr "Игнорировать все базы данных; репликация:" -#: templates/server/replication/master_configuration.twig:12 +#: templates/server/replication/primary_configuration.twig:12 msgid "Please select databases:" msgstr "Пожалуйста, выберите базы данных:" -#: templates/server/replication/master_configuration.twig:15 +#: templates/server/replication/primary_configuration.twig:15 msgid "" "Now, add the following lines at the end of [mysqld] section in your my.cnf " "and please restart the MySQL server afterwards." @@ -17608,114 +17665,151 @@ msgstr "" "Теперь добавьте данные строки в конец раздела [mysqld] конфигурационного " "файла my.cnf, после чего перезапустите сервер MySQL." -#: templates/server/replication/master_configuration.twig:21 +#: templates/server/replication/primary_configuration.twig:21 +#, fuzzy +#| msgid "" +#| "Once you restarted MySQL server, please click on Go button. Afterwards, " +#| "you should see a message informing you, that this server <strong>is</" +#| "strong> configured as master." msgid "" "Once you restarted MySQL server, please click on Go button. Afterwards, you " "should see a message informing you, that this server <strong>is</strong> " -"configured as master." +"configured as primary." msgstr "" "Сразу после перезапуска MySQL сервера, пожалуйста, нажмите кнопку OK, после " "чего вы должны увидеть сообщение указывающее, что данный сервер " "<strong>настроен</strong> как ведущий." -#: templates/server/replication/master_replication.twig:5 -msgid "This server is configured as master in a replication process." +#: templates/server/replication/primary_replication.twig:5 +#, fuzzy +#| msgid "This server is configured as master in a replication process." +msgid "This server is configured as primary in a replication process." msgstr "Данный сервер настроен головным в процессе репликации." -#: templates/server/replication/master_replication.twig:16 -msgid "Show connected slaves" +#: templates/server/replication/primary_replication.twig:16 +#, fuzzy +#| msgid "Show connected slaves" +msgid "Show connected replicas" msgstr "Показать соединённые подчиненные сервера" -#: templates/server/replication/master_replication.twig:38 +#: templates/server/replication/primary_replication.twig:38 +#, fuzzy +#| msgid "" +#| "Only slaves started with the --report-host=host_name option are visible " +#| "in this list." msgid "" -"Only slaves started with the --report-host=host_name option are visible in " +"Only replicas started with the --report-host=host_name option are visible in " "this list." msgstr "" "Только подчиненные сервера запущенные с ключом --report-host=host_name " "видимы в данном списке." -#: templates/server/replication/slave_configuration.twig:5 -msgid "Master connection:" -msgstr "Главное соединение:" +#: templates/server/replication/replica_configuration.twig:5 +#, fuzzy +#| msgid "Server connection:" +msgid "Primary connection:" +msgstr "Соединение сервера:" -#: templates/server/replication/slave_configuration.twig:25 -msgid "Slave SQL Thread not running!" +#: templates/server/replication/replica_configuration.twig:25 +#, fuzzy +#| msgid "Slave SQL Thread not running!" +msgid "Replica SQL Thread not running!" msgstr "Подчиненный SQL поток не запущен!" -#: templates/server/replication/slave_configuration.twig:28 -msgid "Slave IO Thread not running!" +#: templates/server/replication/replica_configuration.twig:28 +#, fuzzy +#| msgid "Slave IO Thread not running!" +msgid "Replica IO Thread not running!" msgstr "Подчиненный поток ввода-вывода не запущен!" -#: templates/server/replication/slave_configuration.twig:31 +#: templates/server/replication/replica_configuration.twig:31 +#, fuzzy +#| msgid "" +#| "Server is configured as slave in a replication process. Would you like to:" msgid "" -"Server is configured as slave in a replication process. Would you like to:" +"Server is configured as replica in a replication process. Would you like to:" msgstr "" "Сервер настроен в качестве подчиненного для процесса репликации. Произвести " "действие:" -#: templates/server/replication/slave_configuration.twig:34 -msgid "See slave status table" +#: templates/server/replication/replica_configuration.twig:34 +#, fuzzy +#| msgid "See slave status table" +msgid "See replica status table" msgstr "Смотрите таблицу состояния подчинённого сервера" -#: templates/server/replication/slave_configuration.twig:38 -msgid "Control slave:" +#: templates/server/replication/replica_configuration.twig:38 +#, fuzzy +#| msgid "Control slave:" +msgid "Control replica:" msgstr "Контролировать подчинённый сервер:" -#: templates/server/replication/slave_configuration.twig:48 -msgid "Reset slave" -msgstr "Сбросить подчиненный сервер" +#: templates/server/replication/replica_configuration.twig:48 +#, fuzzy +#| msgid "Not replicated" +msgid "Reset replica" +msgstr "Не реплицировано" -#: templates/server/replication/slave_configuration.twig:54 +#: templates/server/replication/replica_configuration.twig:54 msgid "Start SQL Thread only" msgstr "Запустить только SQL поток" -#: templates/server/replication/slave_configuration.twig:56 +#: templates/server/replication/replica_configuration.twig:56 msgid "Stop SQL Thread only" msgstr "Остановить только SQL поток" -#: templates/server/replication/slave_configuration.twig:63 +#: templates/server/replication/replica_configuration.twig:63 msgid "Start IO Thread only" msgstr "Запустить только поток ввода-вывода" -#: templates/server/replication/slave_configuration.twig:65 +#: templates/server/replication/replica_configuration.twig:65 msgid "Stop IO Thread only" msgstr "Остановить только поток ввода-вывода" -#: templates/server/replication/slave_configuration.twig:74 +#: templates/server/replication/replica_configuration.twig:74 msgid "Error management:" msgstr "Управление ошибками:" -#: templates/server/replication/slave_configuration.twig:77 -msgid "Skipping errors might lead into unsynchronized master and slave!" +#: templates/server/replication/replica_configuration.twig:77 +#, fuzzy +#| msgid "Skipping errors might lead into unsynchronized master and slave!" +msgid "Skipping errors might lead into unsynchronized primary and replica!" msgstr "" "Игнорирование ошибок может привести к рассинхронизации головного и " "подчинённого сервера!" -#: templates/server/replication/slave_configuration.twig:81 +#: templates/server/replication/replica_configuration.twig:81 msgid "Skip current error" msgstr "Игнорировать текущую ошибку" -#: templates/server/replication/slave_configuration.twig:87 +#: templates/server/replication/replica_configuration.twig:87 #, php-format msgid "Skip next %s errors." msgstr "Игнорировать следующие %s ошибки." -#: templates/server/replication/slave_configuration.twig:107 -#, php-format +#: templates/server/replication/replica_configuration.twig:107 +#, fuzzy, php-format +#| msgid "" +#| "This server is not configured as slave in a replication process. Would " +#| "you like to %sconfigure%s it?" msgid "" -"This server is not configured as slave in a replication process. Would you " +"This server is not configured as replica in a replication process. Would you " "like to %sconfigure%s it?" msgstr "" "Данный сервер не настроен в качестве ведомого для процесса репликации. " "Хотите %sнастроить%s это?" #: templates/server/replication/status_table.twig:6 -msgid "Master status" -msgstr "Статус Master" +#, fuzzy +#| msgid "Import status" +msgid "Primary status" +msgstr "Импортировать состояние" #: templates/server/replication/status_table.twig:8 -msgid "Slave status" -msgstr "Статус Slave" +#, fuzzy +#| msgid "Replication status" +msgid "Replica status" +msgstr "Состояние репликации" #: templates/server/replication/status_table.twig:16 #: templates/server/status/variables/index.twig:75 @@ -18097,20 +18191,32 @@ msgstr "" "образом, статистика, передаваемая сервером MySQL, может быть некорректной." #: templates/server/status/status/index.twig:59 +#, fuzzy +#| msgid "" +#| "This MySQL server works as <b>master</b> and <b>slave</b> in " +#| "<b>replication</b> process." msgid "" -"This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</" -"b> process." +"This MySQL server works as <b>primary</b> and <b>replica</b> in " +"<b>replication</b> process." msgstr "" "Этот сервер MySQL работает как <b>ведущий</b> и <b>подчинённый</b> в " "процессе <b>репликации</b>." #: templates/server/status/status/index.twig:61 -msgid "This MySQL server works as <b>master</b> in <b>replication</b> process." +#, fuzzy +#| msgid "" +#| "This MySQL server works as <b>master</b> in <b>replication</b> process." +msgid "" +"This MySQL server works as <b>primary</b> in <b>replication</b> process." msgstr "" "Этот сервер MySQL работает как <b>ведущий</b> в процессе <b>репликации</b>." #: templates/server/status/status/index.twig:63 -msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process." +#, fuzzy +#| msgid "" +#| "This MySQL server works as <b>slave</b> in <b>replication</b> process." +msgid "" +"This MySQL server works as <b>replica</b> in <b>replication</b> process." msgstr "" "Этот сервер MySQL работает как <b>подчинённый</b> в процессе <b>репликации</" "b>." @@ -19180,6 +19286,24 @@ msgstr "VIEW название" msgid "Column names" msgstr "Названия столбцов" +#~ msgid "Do you really want to RESET SLAVE?" +#~ msgstr "Вы действительно хотите СБРОСИТЬ ПОДЧИНЕННЫЙ СЕРВЕР?" + +#~ msgid "Master configuration" +#~ msgstr "Настройка головного сервера" + +#~ msgid "Master connection:" +#~ msgstr "Главное соединение:" + +#~ msgid "Reset slave" +#~ msgstr "Сбросить подчиненный сервер" + +#~ msgid "Master status" +#~ msgstr "Статус Master" + +#~ msgid "Slave status" +#~ msgstr "Статус Slave" + #~ msgid "SQL history" #~ msgstr "История SQL-запросов" |