From c6bb86778797bc25891ef07106bf71d48881fbac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrija=20Vu=C4=8Dini=C4=87?= Date: Wed, 11 May 2022 22:47:11 +0200 Subject: [PATCH 1/7] Revert to old behavior for `ShowServerInfo` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Seems we changed the flag behavior here: https://github.com/phpmyadmin/phpmyadmin/commit/cd1b8a9b770b9e8e4589e5de808ead4ab781595b#diff-bb8d8aecc2e174245e8b95be9344176aba8971d024f3b2c2311b8e58ddd59b31L149 I'm not sure whether that was intentional, but it causes the `Database server` panel to always show compared to pre 5.2.0. Truth be told, it doesn't make sense to have that flag and then the additional checks in the block when we know it's `true`, so I updated the code to take care of that. Signed-off-by: Andrija Vučinić --- libraries/classes/Controllers/HomeController.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index 2b998682f0..322ed3702e 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -143,20 +143,16 @@ class HomeController extends AbstractController } $databaseServer = []; - if ($server > 0) { + if ($server > 0 && $cfg['ShowServerInfo']) { $hostInfo = ''; if (! empty($cfg['Server']['verbose'])) { $hostInfo .= $cfg['Server']['verbose']; - if ($cfg['ShowServerInfo']) { - $hostInfo .= ' ('; - } + $hostInfo .= ' ('; } - if ($cfg['ShowServerInfo'] || empty($cfg['Server']['verbose'])) { - $hostInfo .= $this->dbi->getHostInfo(); - } + $hostInfo .= $this->dbi->getHostInfo(); - if (! empty($cfg['Server']['verbose']) && $cfg['ShowServerInfo']) { + if (! empty($cfg['Server']['verbose'])) { $hostInfo .= ')'; } From b4b27cf9b5701c67027472a61d79a310221cfe13 Mon Sep 17 00:00:00 2001 From: liviuconcioiu Date: Sun, 29 May 2022 09:47:31 +0000 Subject: [PATCH 2/7] Translated using Weblate (Romanian) Currently translated at 91.8% (3138 of 3418 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ro/ Signed-off-by: liviuconcioiu --- po/ro.po | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/po/ro.po b/po/ro.po index 6d4e8b6aa8..a22f65b022 100644 --- a/po/ro.po +++ b/po/ro.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2022-04-21 15:54-0300\n" -"PO-Revision-Date: 2022-02-17 10:35+0000\n" +"PO-Revision-Date: 2022-05-30 10:14+0000\n" "Last-Translator: liviuconcioiu \n" "Language-Team: Romanian \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Weblate 4.11-dev\n" +"X-Generator: Weblate 4.13-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -3310,7 +3310,7 @@ msgstr "Timp maxim de execuție" #: libraries/classes/Config/Descriptions.php:655 msgid "Use [code]LOCK TABLES[/code] statement" -msgstr "" +msgstr "Folosește declarația [code]LOCK TABLES[/code]" #: libraries/classes/Config/Descriptions.php:656 msgid "Save as file" @@ -4568,7 +4568,7 @@ msgstr "Fragment Content-Security-Policy pentru API reCAPTCHA v2" #: libraries/classes/Config/Descriptions.php:969 msgid "Request parameter for reCAPTCHA v2 API" -msgstr "" +msgstr "Parametrul cererii pentru API reCAPTCHA v2" #: libraries/classes/Config/Descriptions.php:970 msgid "Response parameter for reCAPTCHA v2 API" @@ -5137,7 +5137,7 @@ msgstr "Arăt rândurile %1$s - %2$s." #, php-format msgid "" "There already exists a page named \"%s\" please rename it to something else." -msgstr "" +msgstr "Există deja o pagină numită „%s”. Te rog să o redenumești în altceva." #: libraries/classes/Controllers/Database/ExportController.php:81 #: libraries/classes/Controllers/Database/TrackingController.php:130 @@ -7100,6 +7100,8 @@ msgid "" "The HEX function will treat the integer as a string while calculating the " "hexadecimal value" msgstr "" +"Funcția HEX va trata întregul ca un șir în timp ce calculează valoarea " +"hexazecimală" #: libraries/classes/Controllers/JavaScriptMessagesController.php:498 msgid "" @@ -7564,7 +7566,7 @@ msgstr "A expirat așteptarea pentru activarea cheii de securitate." #: libraries/classes/Controllers/JavaScriptMessagesController.php:685 msgctxt "U2F error" msgid "Invalid request sent to security key." -msgstr "" +msgstr "Cerere nevalidă trimisă către cheia de securitate." #. l10n: unknown error code (from U2F API) #: libraries/classes/Controllers/JavaScriptMessagesController.php:687 @@ -7598,6 +7600,9 @@ msgid "" "working in your browser and your phpMyAdmin configuration storage is not " "configured for this." msgstr "" +"Nu poți deschide, salva sau șterge aspectul paginii, deoarece IndexedDB nu " +"funcționează în navigator și spațiul de stocare al configurației phpMyAdmin " +"nu este configurat pentru acesta." #: libraries/classes/Controllers/JavaScriptMessagesController.php:702 #, fuzzy, php-format @@ -11985,12 +11990,12 @@ msgid "Converts an Internet network address in (IPv4/IPv6) format to binary" msgstr "Convertește o adresă de rețea Internet în format (IPv4/IPv6) la binar" #: libraries/classes/Plugins/Transformations/Input/Text_Plain_Iptolong.php:29 -#, fuzzy -#| msgid "Converts an Internet network address in (IPv4/IPv6) format to binary" msgid "" "Converts an Internet network address in (IPv4/IPv6) format into a long " "integer." -msgstr "Convertește o adresă de rețea Internet în format (IPv4/IPv6) la binar" +msgstr "" +"Convertește o adresă de rețea Internet în format (IPv4/IPv6) într-un întreg " +"lung." #: libraries/classes/Plugins/Transformations/Input/Text_Plain_JsonEditor.php:26 msgid "Syntax highlighted CodeMirror editor for JSON." @@ -15718,7 +15723,7 @@ msgstr "Sari peste tabelele mai mari de:" #: templates/export.twig:476 msgid "The size is measured in MiB." -msgstr "" +msgstr "Mărimea este măsurată în MiB." #: templates/export.twig:482 templates/import.twig:182 msgid "Format-specific options:" @@ -16169,11 +16174,8 @@ msgstr "calendar-month-year" #. l10n: Year suffix for calendar, "none" is empty. #: templates/javascript/variables.twig:11 -#, fuzzy -#| msgctxt "Year suffix" -#| msgid "none" msgid "none" -msgstr "Niciunul" +msgstr "niciunul" #. l10n: Previous month. Display text for previous month link in calendar #: templates/javascript/variables.twig:16 @@ -16375,7 +16377,7 @@ msgstr "Te rog introdu o intrare HEX validă" #. l10n: To validate the usage of a MD5 function on the column #: templates/javascript/variables.twig:108 msgid "This column can not contain a 32 chars value" -msgstr "" +msgstr "Această coloană nu poate conține o valoare de 32 de caractere" #. l10n: To validate the usage of a AES_ENCRYPT/DES_ENCRYPT function on the column #: templates/javascript/variables.twig:109 @@ -17412,7 +17414,7 @@ msgstr "Permite crearea de rutine stocate." #: templates/server/privileges/privileges_table.twig:670 msgid "Not used on MariaDB." -msgstr "" +msgstr "Nu este folosit pe MariaDB." #: templates/server/privileges/privileges_table.twig:670 #, fuzzy @@ -18403,7 +18405,7 @@ msgstr "Adaugă un server nou" #: templates/setup/servers/index.twig:17 msgid "Something went wrong." -msgstr "" +msgstr "Ceva nu a mers bine." #: templates/sql/bookmark.twig:11 templates/sql/bookmark.twig:29 msgid "Bookmark this SQL query" @@ -19256,7 +19258,7 @@ msgstr "Bară de navigare tabel" #. l10n: Current page #: templates/top_menu.twig:14 msgid "(current)" -msgstr "" +msgstr "(actuală)" #: templates/transformation_overview.twig:1 #, fuzzy From 7a6464b15eaf46f1624661a7d6372ec502f5a058 Mon Sep 17 00:00:00 2001 From: Kristijan Fremen Velkovski Date: Wed, 1 Jun 2022 04:48:26 +0000 Subject: [PATCH 3/7] Translated using Weblate (Macedonian) Currently translated at 14.9% (512 of 3418 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/ Signed-off-by: Kristijan Fremen Velkovski --- po/mk.po | 51 +++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/po/mk.po b/po/mk.po index d12d75d945..8ef4ab51cd 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2022-04-21 15:54-0300\n" -"PO-Revision-Date: 2022-05-27 05:56+0000\n" +"PO-Revision-Date: 2022-06-02 08:18+0000\n" "Last-Translator: Kristijan Fremen Velkovski \n" "Language-Team: Macedonian \n" @@ -36,9 +36,8 @@ msgid "The uptime is only %s" msgstr "Работно време е само %s" #: libraries/advisory_rules_generic.php:22 -#, fuzzy msgid "Questions below 1,000" -msgstr "Персиски" +msgstr "Прашања под 1,000" #: libraries/advisory_rules_generic.php:26 msgid "" @@ -55,20 +54,18 @@ msgid "" msgstr "" #: libraries/advisory_rules_generic.php:32 -#, fuzzy, php-format -#| msgid "Connections" +#, php-format msgid "Current amount of Questions: %s" -msgstr "Конекции" +msgstr "Сегашна вредност на Прашања: %s" #: libraries/advisory_rules_generic.php:37 -#, fuzzy msgid "Percentage of slow queries" -msgstr "Прикажи комплетни упити" +msgstr "Процентажа на спори барања" #: libraries/advisory_rules_generic.php:41 msgid "" "There is a lot of slow queries compared to the overall amount of Queries." -msgstr "" +msgstr "Има многу спори барања во споредба со вкупниот број на Барања." #: libraries/advisory_rules_generic.php:43 #: libraries/advisory_rules_generic.php:56 @@ -177,15 +174,14 @@ msgstr "" #: libraries/advisory_rules_generic.php:113 #: libraries/advisory_rules_generic.php:127 #: libraries/advisory_rules_generic.php:138 -#, fuzzy, php-format +#, php-format msgid "Current version: %s" -msgstr "Верзија на серверот" +msgstr "Сегашна верзија: %s" #: libraries/advisory_rules_generic.php:118 #: libraries/advisory_rules_generic.php:132 -#, fuzzy msgid "Minor Version" -msgstr "Персиски" +msgstr "Мала Верзија" #: libraries/advisory_rules_generic.php:122 msgid "Version less than 5.1.30 (the first GA release of 5.1)." @@ -202,11 +198,8 @@ msgid "Version less than 5.5.8 (the first GA release of 5.5)." msgstr "Верзија пониска од 5.5.8 (првата GA верзија од 5.5)." #: libraries/advisory_rules_generic.php:137 -#, fuzzy -#| msgid "You should upgrade to %s %s or later." msgid "You should upgrade, to a stable version of MySQL 5.5." -msgstr "" -"Би требало да го надоградите вашиот %s сервер на верзија %s или понова." +msgstr "Би требало да надградите до стабилна верзија на MySQL 5.5." #: libraries/advisory_rules_generic.php:143 #: libraries/advisory_rules_generic.php:156 @@ -248,10 +241,8 @@ msgid "'percona' found in version_comment" msgstr "" #: libraries/advisory_rules_generic.php:168 -#, fuzzy -#| msgid "MySQL charset" msgid "MySQL Architecture" -msgstr "MySQL множество на знаци" +msgstr "MySQL архитектура" #: libraries/advisory_rules_generic.php:172 msgid "MySQL is not compiled as a 64-bit package." @@ -5035,6 +5026,8 @@ msgstr "Името на базата на податоци е празно!" #: libraries/classes/Controllers/Database/OperationsController.php:99 msgid "Cannot copy database to the same name. Change the name and try again." msgstr "" +"Не може да се ископира базата на податоци со исто име. Сменете го името и " +"пробајте повторно." #: libraries/classes/Controllers/Database/OperationsController.php:177 #, fuzzy, php-format @@ -5049,15 +5042,11 @@ msgid "Database %1$s has been copied to %2$s." msgstr "Базата на податоци %s е ископирана во %s" #: libraries/classes/Controllers/Database/OperationsController.php:296 -#, fuzzy, php-format -#| msgid "" -#| " additional features for working with linked tables have been ctivated. " -#| "To find out why click %shere%s." +#, php-format msgid "" "The phpMyAdmin configuration storage has been deactivated. %sFind out why%s." msgstr "" -"Дополнителните можности за работа со поврзаните табели се исклучени. За да " -"дознаете зошто, кликнете %sовде%s." +"Конфигурационото складирање на phpMyAdmin беше исклучено. %sДознајте зошто%s." #: libraries/classes/Controllers/Database/SearchController.php:52 #: libraries/classes/Plugins/Auth/AuthenticationConfig.php:90 @@ -5195,15 +5184,15 @@ msgstr "Привилегиите се успешно вчитани." msgid "" "Version %1$s was created for selected tables, tracking is active for them." msgstr "" +"Верзија %1$s е креирана за избраните табели, следењето е активирано за нив." #: libraries/classes/Controllers/Database/TrackingController.php:120 msgid "No tables selected." msgstr "Не е избрана ниту една табела." #: libraries/classes/Controllers/Database/TrackingController.php:155 -#, fuzzy msgid "Database Log" -msgstr "База на податоци" +msgstr "Журнал на базата на податоци" #: libraries/classes/Controllers/ErrorReportController.php:106 msgid "" @@ -5334,10 +5323,8 @@ msgid "" msgstr "" #: libraries/classes/Controllers/Import/ImportController.php:108 -#, fuzzy -#| msgid "Complete inserts" msgid "Incomplete params" -msgstr "Комплетен INSERT (со имиња на полињата)" +msgstr "Непотполни параметри" #: libraries/classes/Controllers/Import/ImportController.php:122 msgid "Succeeded" @@ -5346,7 +5333,7 @@ msgstr "Успешно" #: libraries/classes/Controllers/Import/ImportController.php:126 #: libraries/classes/Controllers/JavaScriptMessagesController.php:575 msgid "Failed" -msgstr "" +msgstr "Неуспешно" #: libraries/classes/Controllers/Import/ImportController.php:217 #, php-format From 6443743d7061c84880d02c07a5e05e5232e14b25 Mon Sep 17 00:00:00 2001 From: AHOHNMYC Date: Tue, 31 May 2022 13:50:44 +0000 Subject: [PATCH 4/7] Translated using Weblate (Russian) Currently translated at 97.6% (3337 of 3418 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ru/ Signed-off-by: AHOHNMYC --- po/ru.po | 339 +++++++++++-------------------------------------------- 1 file changed, 67 insertions(+), 272 deletions(-) diff --git a/po/ru.po b/po/ru.po index b2facc05d0..e19ef80cb7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2022-04-21 15:54-0300\n" -"PO-Revision-Date: 2022-05-27 05:56+0000\n" -"Last-Translator: Platon \n" +"PO-Revision-Date: 2022-06-02 08:18+0000\n" +"Last-Translator: AHOHNMYC \n" "Language-Team: Russian \n" "Language: ru\n" @@ -296,12 +296,6 @@ 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 memcached 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 - Shift+Enter for a newline." -msgstr "Для отмены редактирования нажмите Esc." +msgstr "" +"Для отмены редактирования нажмите Esc.
- Shift+Enter для перехода на " +"новую строку." #: libraries/classes/Controllers/JavaScriptMessagesController.php:548 msgid "" @@ -7533,8 +7484,6 @@ msgstr "Сложный" #. l10n: error code 5 (from U2F API) #: libraries/classes/Controllers/JavaScriptMessagesController.php:683 -#, fuzzy -#| msgid "Timed out waiting for security key activation." msgctxt "U2F error" msgid "Timed out waiting for security key activation." msgstr "Превышено время ожидания для активации ключа безопасности." @@ -7561,11 +7510,9 @@ msgstr "" #. l10n: error code 4 (from U2F API) on register #: libraries/classes/Controllers/JavaScriptMessagesController.php:691 -#, fuzzy -#| msgid "Failed security key activation (%s)." msgctxt "U2F error" msgid "Failed security key activation." -msgstr "Ошибка активации ключа безопасности (%s)." +msgstr "Ошибка активации ключа безопасности." #. l10n: error code 4 (from U2F API) on authanticate #: libraries/classes/Controllers/JavaScriptMessagesController.php:693 @@ -10404,10 +10351,8 @@ msgid "New" msgstr "Новый" #: libraries/classes/Navigation/Nodes/NodeTrigger.php:28 -#, fuzzy -#| msgid "Triggers" msgid "Trigger" -msgstr "Триггеры" +msgstr "Триггер" #: libraries/classes/Navigation/Nodes/NodeViewContainer.php:25 #: libraries/classes/Navigation/Nodes/NodeViewContainer.php:26 @@ -12049,16 +11994,12 @@ msgid "Hardware Security Key (FIDO U2F)" msgstr "Аппаратный ключ безопасности (FIDO U2F)" #: libraries/classes/Plugins/TwoFactor/Key.php:214 -#, fuzzy -#| msgid "" -#| "Provides authentication using hardware security tokens supporting FIDO " -#| "U2F." msgid "" "Provides authentication using hardware security tokens supporting FIDO U2F, " "such as a Yubikey." msgstr "" "Обеспечивает аутентификацию с помощью аппаратных токенов безопасности, " -"поддерживающих FIDO U2F." +"поддерживающих FIDO U2F, таких, как Yubikey." #: libraries/classes/Plugins/TwoFactorPlugin.php:73 #, php-format @@ -12179,9 +12120,6 @@ msgid "Unable to connect to primary %s." msgstr "Невозможно соединиться с головным сервером %s." #: libraries/classes/ReplicationGui.php:530 -#, fuzzy -#| msgid "" -#| "Unable to read master log position. Possible privilege problem on master." msgid "" "Unable to read primary log position. Possible privilege problem on primary." msgstr "" @@ -12189,14 +12127,11 @@ msgstr "" "настройке привилегий головного сервера." #: libraries/classes/ReplicationGui.php:548 -#, fuzzy -#| msgid "Unable to change master!" msgid "Unable to change primary!" msgstr "Невозможно изменить главный сервер!" #: libraries/classes/ReplicationGui.php:552 -#, fuzzy, php-format -#| msgid "Master server changed successfully to %s." +#, php-format msgid "Primary server changed successfully to %s." msgstr "Главный сервер успешно изменён на %s." @@ -12453,19 +12388,14 @@ msgstr "Разрешает блокировку таблиц для текуще #: libraries/classes/Server/Privileges.php:433 #: templates/server/privileges/privileges_table.twig:694 #: templates/server/privileges/privileges_table.twig:697 -#, fuzzy -#| msgid "Needed for the replication slaves." msgid "Needed for the replication replicas." msgstr "Необходимо для подчиненных серверов при репликации." #: libraries/classes/Server/Privileges.php:438 #: templates/server/privileges/privileges_table.twig:681 #: templates/server/privileges/privileges_table.twig:684 -#, fuzzy -#| msgid "Allows the user to ask where the slaves / masters are." msgid "Allows the user to ask where the replicas / primaries are." -msgstr "" -"Разрешает запрашивать местонахождение головного и подчиненных серверов." +msgstr "Разрешает запрашивать местонахождение головного и подчиненных серверов." #: libraries/classes/Server/Privileges.php:448 #: templates/server/privileges/privileges_table.twig:524 @@ -12705,21 +12635,15 @@ msgid "Show open tables" msgstr "Список открытых таблиц" #: libraries/classes/Server/Status/Data.php:193 -#, fuzzy -#| msgid "Show slave hosts" msgid "Show replica hosts" msgstr "Информация о подчиненных серверах" #: libraries/classes/Server/Status/Data.php:200 #: templates/server/replication/primary_replication.twig:9 -#, fuzzy -#| msgid "Show master status" msgid "Show primary status" msgstr "Показать состояние головного сервера" #: libraries/classes/Server/Status/Data.php:207 -#, fuzzy -#| msgid "Show slave status" msgid "Show replica status" msgstr "Информация о состоянии сервера репликации" @@ -13478,8 +13402,6 @@ msgstr "Дек" #. l10n: Short week day name for Sunday #: libraries/classes/Util.php:690 -#, fuzzy -#| msgid "Sun" msgctxt "Short week day name for Sunday" msgid "Sun" msgstr "Вс" @@ -13820,10 +13742,8 @@ msgstr "Соединение:" #: templates/columns_definitions/column_definitions_form.twig:113 #: templates/columns_definitions/partitions.twig:137 #: templates/table/operations/index.twig:133 -#, fuzzy -#| msgid "Storage engines" msgid "Storage engine" -msgstr "Механизмы хранилища" +msgstr "Механизм хранилища" #: templates/columns_definitions/column_definitions_form.twig:136 msgid "PARTITION definition:" @@ -13853,10 +13773,8 @@ msgstr "" #: templates/table/relation/common_form.twig:233 #: templates/table/zoom_search/result_form.twig:26 #: templates/table/zoom_search/result_form.twig:95 -#, fuzzy -#| msgid "Loading…" msgid "Loading" -msgstr "Загрузка…" +msgstr "Загрузка" #: templates/columns_definitions/column_name.twig:4 #, php-format @@ -14189,15 +14107,11 @@ msgid "Set default" msgstr "Сбросить настройки" #: templates/console/display.twig:162 -#, fuzzy -#| msgid "" -#| "Execute queries on Enter and insert new line with Shift + Enter. To make " -#| "this permanent, view settings." msgid "" "Execute queries on Enter and insert new line with Shift+Enter. To make this " "permanent, view settings." msgstr "" -"Выполнить запрос по нажатию Enter и вставить новую строку по нажатию Shift + " +"Выполнить запрос по нажатию Enter и вставить новую строку по нажатию Shift+" "Enter. Чтобы сделать эту опцию постоянной, смотрите настройки." #: templates/create_tracking_version.twig:10 @@ -14223,8 +14137,6 @@ msgid "Create version" msgstr "Создать версию" #: templates/database/central_columns/edit.twig:15 -#, fuzzy -#| msgid "A_I" msgctxt "Auto Increment" msgid "A_I" msgstr "A_I" @@ -14300,10 +14212,8 @@ msgstr "Действие" #: templates/database/create_table.twig:3 #: templates/database/operations/index.twig:27 -#, fuzzy -#| msgid "Create table" msgid "Create new table" -msgstr "Создать таблицу" +msgstr "Создать новую таблицу" #: templates/database/create_table.twig:10 #: templates/database/operations/index.twig:34 @@ -14654,10 +14564,8 @@ msgid "Check all" msgstr "Отметить все" #: templates/database/events/index.twig:27 -#, fuzzy -#| msgid "Create event" msgid "Create new event" -msgstr "Создать представление" +msgstr "Создать новое событие" #: templates/database/events/index.twig:36 msgid "There are no events to display." @@ -14995,8 +14903,6 @@ msgstr "Добавить/удалить столбцы:" #: templates/database/qbe/selection_form.twig:86 #: templates/database/qbe/selection_form.twig:88 -#, fuzzy -#| msgid "Use Tables" msgid "Use tables" msgstr "Использовать таблицы" @@ -15414,10 +15320,8 @@ msgid "Time" msgstr "Время" #: templates/database/triggers/list.twig:27 -#, fuzzy -#| msgid "Create trigger" msgid "Create new trigger" -msgstr "Создать представление" +msgstr "Создать новый триггер" #: templates/database/triggers/list.twig:36 msgid "There are no triggers to display." @@ -15676,10 +15580,8 @@ msgstr "" "Подробности смотрите в %4$sFAQ%5$s." #: templates/export.twig:398 -#, fuzzy -#| msgid "use this for future exports" msgid "Use this for future exports" -msgstr "использовать для будущего экспорта" +msgstr "Использовать для будущего экспорта" #: templates/export.twig:409 templates/import.twig:103 msgid "Character set of the file:" @@ -15893,11 +15795,9 @@ msgid "Theme" msgstr "Тема" #: templates/home/index.twig:142 -#, fuzzy -#| msgid "View only" msgctxt "View all themes" msgid "View all" -msgstr "Просмотр" +msgstr "Просмотреть все" #: templates/home/index.twig:157 msgid "Database server" @@ -16077,10 +15977,8 @@ msgid "Select from the web server upload directory [strong]%s[/strong]:" msgstr "Выберите из каталога загрузки сервера [strong]%s[/strong]:" #: templates/import.twig:69 templates/import.twig:96 -#, fuzzy -#| msgid "There are no files to upload!" msgid "There are no files to import!" -msgstr "Файлы для загрузки отсутствуют!" +msgstr "Файлы для импорта отсутствуют!" #: templates/import.twig:100 msgid "File uploads are not allowed on this server." @@ -16099,32 +15997,20 @@ msgstr "" "перезапуска импорт будет продолжен с позиции %d." #: templates/import.twig:138 -#, fuzzy -#| msgid "" -#| "Allow the interruption of an import in case the script detects it is " -#| "close to the PHP timeout limit. (This might be a good way to import " -#| "large files, however it can break transactions.)" msgid "" "Allow the interruption of an import in case the script detects it is close " "to the PHP timeout limit." msgstr "" "Разрешить скрипту разбивать процесс импорта при приближении временного " -"лимита. (Может быть использовано при импорте файлов большого размера, " -"однако при этом вероятны проблемы с транзакциями.)" +"лимита." #: templates/import.twig:140 -#, fuzzy -#| msgid "" -#| "Allow interrupt of import in case script detects it is close to time " -#| "limit. This might be a good way to import large files, however it can " -#| "break transactions." msgid "" "This might be a good way to import large files, however it can break " "transactions." msgstr "" -"Позволяет прервать процесс импорта в случае определения приближения " -"временного лимита на выполнение скрипта. Может помочь при импорте файлов " -"большого размера, однако небезопасно для транзакций." +"Может помочь при импорте файлов большого размера, однако небезопасно для " +"транзакций." #: templates/import.twig:144 msgid "Skip this number of queries (for SQL) starting from the first one:" @@ -16136,10 +16022,8 @@ msgstr "Прочие параметры" #: templates/indexes.twig:39 #: templates/table/structure/display_structure.twig:489 -#, fuzzy -#| msgid "Rename to" msgid "Rename" -msgstr "Переименовать в" +msgstr "Переименовать" #: templates/indexes.twig:45 #: templates/table/structure/display_structure.twig:495 @@ -16159,9 +16043,6 @@ msgstr "calendar-year-month" #. l10n: Year suffix for calendar, "none" is empty. #: templates/javascript/variables.twig:11 -#, fuzzy -#| msgctxt "Year suffix" -#| msgid "none" msgid "none" msgstr "none" @@ -16468,10 +16349,8 @@ msgid "Verify" msgstr "Подтверждение" #: templates/menu/breadcrumbs.twig:27 -#, fuzzy -#| msgid "Views:" msgid "View:" -msgstr "Представления:" +msgstr "Представление:" #: templates/modals/unhide_nav_item.twig:5 msgid "Show hidden navigation tree items." @@ -16851,66 +16730,48 @@ msgid "SQL history:" msgstr "История SQL-запросов:" #: templates/relation/check_relations.twig:245 -#, fuzzy -#| msgid "Persistent recently used tables" msgid "Persistent recently used tables:" -msgstr "Недавно использованные таблицы" +msgstr "Недавно использованные таблицы:" #: templates/relation/check_relations.twig:270 -#, fuzzy -#| msgid "Persistent favorite tables" msgid "Persistent favorite tables:" -msgstr "Постоянно используемые таблицы избранных" +msgstr "Постоянно используемые таблицы избранных:" #: templates/relation/check_relations.twig:295 -#, fuzzy -#| msgid "Persistent tables' UI preferences" msgid "Persistent tables' UI preferences:" -msgstr "Настройки интерфейса часто используемых таблиц" +msgstr "Настройки интерфейса часто используемых таблиц:" #: templates/relation/check_relations.twig:320 msgid "Tracking:" msgstr "Отслеживание:" #: templates/relation/check_relations.twig:345 -#, fuzzy -#| msgid "User preferences" msgid "User preferences:" -msgstr "Пользовательские настройки" +msgstr "Пользовательские настройки:" #: templates/relation/check_relations.twig:383 -#, fuzzy -#| msgid "Configurable menus" msgid "Configurable menus:" -msgstr "Настраиваемые меню" +msgstr "Настраиваемые меню:" #: templates/relation/check_relations.twig:408 msgid "Hide/show navigation items:" msgstr "Скрыть/показать пункты навигации:" #: templates/relation/check_relations.twig:433 -#, fuzzy -#| msgid "Saving Query-By-Example searches" msgid "Saving Query-By-Example searches:" -msgstr "Сохраняются Query-By-Example" +msgstr "Сохраняются Query-By-Example:" #: templates/relation/check_relations.twig:458 -#, fuzzy -#| msgid "Managing Central list of columns" msgid "Managing central list of columns:" -msgstr "Управление центральным списком столбцов" +msgstr "Управление центральным списком столбцов:" #: templates/relation/check_relations.twig:483 -#, fuzzy -#| msgid "Remembering Designer Settings" msgid "Remembering designer settings:" -msgstr "Запоминание настроек дизайна" +msgstr "Запоминание настроек дизайна:" #: templates/relation/check_relations.twig:508 -#, fuzzy -#| msgid "Saving export templates" msgid "Saving export templates:" -msgstr "Сохранение шаблонов экспорта" +msgstr "Сохранение шаблонов экспорта:" #: templates/relation/check_relations.twig:519 msgid "Quick steps to set up advanced features:" @@ -16981,11 +16842,9 @@ msgid "Character sets and collations" msgstr "Кодировки и сравнения" #: templates/server/collations/index.twig:23 -#, fuzzy -#| msgid "Default" msgctxt "The collation is the default one" msgid "default" -msgstr "По умолчанию" +msgstr "по умолчанию" #: templates/server/databases/index.twig:3 msgid "Databases statistics" @@ -17002,15 +16861,11 @@ msgstr "Нет привилегий для создания баз данных" #: templates/server/databases/index.twig:156 #: templates/server/replication/index.twig:18 #: templates/server/replication/primary_replication.twig:3 -#, fuzzy -#| msgid "Master replication" msgid "Primary replication" msgstr "Репликация головного сервера" #: templates/server/databases/index.twig:160 #: templates/server/replication/replica_configuration.twig:2 -#, fuzzy -#| msgid "Slave replication" msgid "Replica replication" msgstr "Репликация подчинённого сервера" @@ -17533,15 +17388,11 @@ msgid "Save changes" msgstr "Сохранить страницу" #: templates/server/replication/change_primary.twig:5 -#, fuzzy -#| msgid "Slave configuration" msgid "Replica configuration" msgstr "Настройка подчиненного сервера" #: 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 "Изменить, или перенастроить головной сервер" @@ -17558,10 +17409,7 @@ msgid "Port:" msgstr "Порт:" #: templates/server/replication/index.twig:21 -#, fuzzy, php-format -#| msgid "" -#| "This server is not configured as master in a replication process. Would " -#| "you like to %sconfigure%s it?" +#, php-format msgid "" "This server is not configured as primary in a replication process. Would you " "like to %sconfigure%s it?" @@ -17575,8 +17423,6 @@ msgstr "Нет привилегий" #: 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 "Добавьте подчиненного пользователя репликации" @@ -17653,22 +17499,14 @@ msgstr "" "настроен как ведущий." #: 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/primary_replication.twig:16 -#, fuzzy -#| msgid "Show connected slaves" msgid "Show connected replicas" msgstr "Показать соединённые подчиненные сервера" #: 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 replicas started with the --report-host=host_name option are visible in " "this list." @@ -17677,27 +17515,18 @@ msgstr "" "видимы в данном списке." #: templates/server/replication/replica_configuration.twig:5 -#, fuzzy -#| msgid "Server connection:" msgid "Primary connection:" msgstr "Соединение сервера:" #: 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/replica_configuration.twig:28 -#, fuzzy -#| msgid "Slave IO Thread not running!" msgid "Replica IO Thread not running!" msgstr "Подчиненный поток ввода-вывода не запущен!" #: 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 replica in a replication process. Would you like to:" msgstr "" @@ -17705,14 +17534,10 @@ msgstr "" "действие:" #: templates/server/replication/replica_configuration.twig:34 -#, fuzzy -#| msgid "See slave status table" msgid "See replica status table" msgstr "Смотрите таблицу состояния подчинённого сервера" #: templates/server/replication/replica_configuration.twig:38 -#, fuzzy -#| msgid "Control slave:" msgid "Control replica:" msgstr "Контролировать подчинённый сервер:" @@ -17743,8 +17568,6 @@ msgid "Error management:" msgstr "Управление ошибками:" #: 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 "" "Игнорирование ошибок может привести к рассинхронизации головного и " @@ -17760,10 +17583,7 @@ msgid "Skip next %s errors." msgstr "Игнорировать следующие %s ошибки." #: 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?" +#, php-format msgid "" "This server is not configured as replica in a replication process. Would you " "like to %sconfigure%s it?" @@ -17778,10 +17598,8 @@ msgid "Primary status" msgstr "Импортировать состояние" #: templates/server/replication/status_table.twig:8 -#, fuzzy -#| msgid "Replication status" msgid "Replica status" -msgstr "Состояние репликации" +msgstr "Состояние реплики" #: templates/server/replication/status_table.twig:16 #: templates/server/status/variables/index.twig:75 @@ -18135,10 +17953,8 @@ msgstr "#" #: templates/server/status/queries/index.twig:39 #: templates/server/status/status/index.twig:18 #: templates/server/status/status/index.twig:38 -#, fuzzy -#| msgid "per hour" msgid "ø per hour" -msgstr "в час" +msgstr "ø в час" #: templates/server/status/queries/index.twig:59 msgid "Not enough privilege to view query statistics." @@ -18163,10 +17979,6 @@ msgstr "" "образом, статистика, передаваемая сервером MySQL, может быть некорректной." #: templates/server/status/status/index.twig:59 -#, fuzzy -#| msgid "" -#| "This MySQL server works as master and slave in " -#| "replication process." msgid "" "This MySQL server works as primary and replica in " "replication process." @@ -18184,14 +17996,11 @@ msgstr "" "Этот сервер MySQL работает как ведущий в процессе репликации." #: templates/server/status/status/index.twig:63 -#, fuzzy -#| msgid "" -#| "This MySQL server works as slave in replication process." msgid "" "This MySQL server works as replica in replication process." msgstr "" -"Этот сервер MySQL работает как подчинённый в процессе репликации." +"Этот сервер MySQL работает как подчинённый в процессе " +"репликации." #: templates/server/status/status/index.twig:69 msgid "Replication status" @@ -18253,10 +18062,8 @@ msgid "Table level tabs" msgstr "Вкладки уровня таблицы" #: templates/server/user_groups/user_groups.twig:50 -#, fuzzy -#| msgid "Edit user group" msgid "Delete user group" -msgstr "Редактировать группу пользователей" +msgstr "Удалить группу пользователей" #: templates/server/user_groups/user_listings.twig:1 #, php-format @@ -18474,10 +18281,8 @@ msgid "Use this value" msgstr "Использовать это значение" #: templates/table/chart/tbl_chart.twig:10 -#, fuzzy -#| msgid "Chart title" msgid "Chart type" -msgstr "Заголовок графика" +msgstr "Тип графика" #: templates/table/chart/tbl_chart.twig:13 msgctxt "Chart type" @@ -18657,8 +18462,6 @@ msgid "Index choice:" msgstr "Выбор индекса:" #: templates/table/index_form.twig:54 -#, fuzzy -#| msgid "Advanced Options" msgid "Advanced options" msgstr "Дополнительные параметры" @@ -18750,10 +18553,8 @@ msgid "Continue insertion with %s rows" msgstr "Продолжить вставку с %s строки" #: templates/table/maintenance/checksum.twig:13 -#, fuzzy -#| msgid "Check" msgid "Checksum" -msgstr "Проверка" +msgstr "Контрольная сумма" #: templates/table/operations/index.twig:9 msgid "Alter table order by" @@ -18767,10 +18568,8 @@ msgid "(singly)" msgstr "(столбец)" #: templates/table/operations/index.twig:50 -#, fuzzy -#| msgid "Move table to (database.table)" msgid "Move table to (database.table)" -msgstr "Переместить таблицу в (таблицу базы данных .)" +msgstr "Переместить таблицу в (таблицу базы данных)" #: templates/table/operations/index.twig:101 msgid "Table options" @@ -18789,10 +18588,8 @@ msgid "Change all column collations" msgstr "Изменить все сортировки столбцов" #: templates/table/operations/index.twig:251 -#, fuzzy -#| msgid "Copy table to (database.table)" msgid "Copy table to (database.table)" -msgstr "Скопировать таблицу в (таблицу базы данных.)" +msgstr "Скопировать таблицу в (таблицу базы данных)" #: templates/table/operations/index.twig:322 msgid "Switch to copied table" @@ -18816,10 +18613,8 @@ msgid "Empty the table (TRUNCATE)" msgstr "Очистить таблицу (TRUNCATE)" #: templates/table/operations/index.twig:431 -#, fuzzy -#| msgid "Empty the table (TRUNCATE)" msgid "Empty the table (DELETE FROM)" -msgstr "Очистить таблицу (TRUNCATE)" +msgstr "Очистить таблицу (DELETE FROM)" #: templates/table/operations/index.twig:452 msgid "Delete the table (DROP)" From 8262c133d8fb6cef6efca3a5ce28f6adfdd32cb5 Mon Sep 17 00:00:00 2001 From: Domen Date: Mon, 30 May 2022 17:26:31 +0000 Subject: [PATCH 5/7] Translated using Weblate (Slovenian) Currently translated at 99.9% (3416 of 3418 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/sl/ Signed-off-by: Domen --- po/sl.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/sl.po b/po/sl.po index d7fbbd8190..33fa10b520 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2022-04-21 15:54-0300\n" -"PO-Revision-Date: 2022-04-23 11:50+0000\n" +"PO-Revision-Date: 2022-06-02 08:18+0000\n" "Last-Translator: Domen \n" "Language-Team: Slovenian \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" "%100==4 ? 2 : 3;\n" -"X-Generator: Weblate 4.12.1-dev\n" +"X-Generator: Weblate 4.13-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -13498,7 +13498,7 @@ msgstr "Hitro - prikaži kar najmanj možnosti za konfiguriranje" #: libraries/config.values.php:260 msgid "Custom - display all possible options to configure" -msgstr "Po meri - prikaži vse mogoče možnosti za konfiguriranje" +msgstr "Po meri - prikaži vse možnosti za konfiguriranje" #: libraries/config.values.php:261 msgid "Custom - like above, but without the quick/custom choice" @@ -15368,7 +15368,7 @@ msgstr "Hitro - prikaži kar najmanj možnosti" #: templates/export.twig:112 msgid "Custom - display all possible options" -msgstr "Po meri - prikaži vse mogoče možnosti" +msgstr "Po meri - pokaži vse možnosti" #: templates/export.twig:121 msgid "File format to export" From be7357420bc3720294dbbba889abc5528205436b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=90=D0=9D69=D0=9A?= Date: Sat, 4 Jun 2022 09:10:26 +0000 Subject: [PATCH 6/7] Translated using Weblate (Russian) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 97.7% (3340 of 3418 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ru/ Signed-off-by: МАН69К --- po/ru.po | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/po/ru.po b/po/ru.po index e19ef80cb7..3b430a7cb4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2022-04-21 15:54-0300\n" -"PO-Revision-Date: 2022-06-02 08:18+0000\n" -"Last-Translator: AHOHNMYC \n" +"PO-Revision-Date: 2022-06-04 18:55+0000\n" +"Last-Translator: МАН69К \n" "Language-Team: Russian \n" "Language: ru\n" @@ -7637,16 +7637,14 @@ msgstr[1] "%1$d базы данных были успешно удалены." msgstr[2] "%1$d баз данных было успешно удалено." #: libraries/classes/Controllers/Server/Privileges/AccountLockController.php:47 -#, fuzzy, php-format -#| msgid "The columns have been moved successfully." +#, php-format msgid "The account %s@%s has been successfully locked." -msgstr "Поля были успешно перемещены." +msgstr "Аккаунт %s@%s успешно заблокирован." #: libraries/classes/Controllers/Server/Privileges/AccountUnlockController.php:47 -#, fuzzy, php-format -#| msgid "The columns have been moved successfully." +#, php-format msgid "The account %s@%s has been successfully unlocked." -msgstr "Поля были успешно перемещены." +msgstr "Аккаунт %s@%s успешно разблокирован." #: libraries/classes/Controllers/Server/PrivilegesController.php:153 #: libraries/classes/Controllers/Server/UserGroupsController.php:53 @@ -15568,16 +15566,16 @@ msgid "File name template:" msgstr "Шаблон имени файла:" #: templates/export.twig:388 -#, fuzzy, php-format +#, php-format msgid "" "This value is interpreted using the 'strftime' function, so you can use time " "formatting strings. Additionally the following transformations will happen: " "%s Other text will be kept as is. See the FAQ 6.27 for details." msgstr "" -"Значение обрабатывается функцией %1$sstrftime%2$s, благодаря чему возможна " -"вставка текущей даты и времени. Дополнительно могут быть использованы " -"следующие подстановки: %3$s. Остальной текст останется без изменений. " -"Подробности смотрите в %4$sFAQ%5$s." +"Это значение обрабатывается функцией 'strftime', так что вы можете " +"использовать строки форматирования времени. Дополнительно следующие " +"преобразования будут применены: %s. Остальной текст останется без изменений. " +"Подробности смотрите в FAQ 6.27." #: templates/export.twig:398 msgid "Use this for future exports" From 5f9d467ce15d30b8e94fc0d699c1ad8c697eaf3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Mon, 6 Jun 2022 16:35:00 -0300 Subject: [PATCH 7/7] Add ChangeLog entry for #17517 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ci skip] Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 099ff06b71..c4a0b48555 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - issue #17519 Fix Export pages not working in certain conditions - issue #17496 Fix error in table operation page when partitions are broken - issue #17386 Fix system memory and system swap values on Windows +- issue #17517 Fix Database Server panel not getting hidden by ShowServerInfo configuration directive 5.2.0 (2022-05-10) - issue #16521 Upgrade Bootstrap to version 5