From e28e4007d82620ac9de5849feab85defdbf5759d Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Sun, 31 Mar 2024 07:01:07 +0000 Subject: [PATCH 01/14] Translated using Weblate (Hebrew) Currently translated at 46.0% (1577 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/he/ Signed-off-by: Yaron Shahrabani --- po/he.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/he.po b/po/he.po index fe794e0f70..a28b37b1c9 100644 --- a/po/he.po +++ b/po/he.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2023-01-18 12:52+0000\n" +"PO-Revision-Date: 2024-03-31 07:17+0000\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 4.15.1-dev\n" +"X-Generator: Weblate 5.5-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -4117,7 +4117,7 @@ msgstr "הצגת היסטוריית שאילתות בהתחלה" #: libraries/classes/Config/Descriptions.php:978 #: templates/console/display.twig:149 msgid "Always expand query messages" -msgstr "" +msgstr "תמיד להרחיב הודעות תשאול" #: libraries/classes/Config/Descriptions.php:979 #: templates/console/display.twig:157 @@ -12815,7 +12815,7 @@ msgstr "" #: templates/database/central_columns/main.twig:71 #: templates/database/central_columns/main.twig:298 msgid "Edit ENUM/SET values" -msgstr "" +msgstr "עריכת ערכי ENUM/SET" #: templates/columns_definitions/column_attributes.twig:38 #: templates/database/central_columns/edit_table_row.twig:30 @@ -12832,7 +12832,7 @@ msgstr "ללא" #: templates/database/central_columns/main.twig:77 #: templates/database/central_columns/main.twig:312 msgid "As defined:" -msgstr "" +msgstr "כפי שהוגדר:" #: templates/columns_definitions/column_attributes.twig:102 msgid "" @@ -12872,7 +12872,7 @@ msgstr "ביטוי" #: templates/columns_definitions/column_attributes.twig:186 msgid "first" -msgstr "" +msgstr "ראשון" #: templates/columns_definitions/column_attributes.twig:191 #: templates/table/structure/display_structure.twig:450 From cc2ab4bde6d797b8c9e5a8e25c3af1901f1f1d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Mon, 1 Apr 2024 03:11:38 +0200 Subject: [PATCH 02/14] Test for delimiter after exported trigger MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Krög --- test/classes/Plugins/Export/ExportSqlTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php index a9ae0955da..e6aa176ef4 100644 --- a/test/classes/Plugins/Export/ExportSqlTest.php +++ b/test/classes/Plugins/Export/ExportSqlTest.php @@ -1061,7 +1061,7 @@ class ExportSqlTest extends AbstractTestCase $this->assertIsString($result); $this->assertStringContainsString('-- Triggers test_table', $result); $this->assertStringContainsString( - 'CREATE TRIGGER `test_trigger` AFTER INSERT ON `test_table` FOR EACH ROW BEGIN END', + "CREATE TRIGGER `test_trigger` AFTER INSERT ON `test_table` FOR EACH ROW BEGIN END\n$$", $result ); From ec2d9ba982429053ff7884f676c1661e62fa23cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= Date: Mon, 1 Apr 2024 03:23:21 +0200 Subject: [PATCH 03/14] Add missing $$ delimiter to exported triggers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Krög --- libraries/classes/Plugins/Export/ExportSql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php index cc38feb0c7..e387d60c09 100644 --- a/libraries/classes/Plugins/Export/ExportSql.php +++ b/libraries/classes/Plugins/Export/ExportSql.php @@ -2127,7 +2127,7 @@ class ExportSql extends ExportPlugin $usedAlias = true; } - $triggerQuery .= 'DELIMITER ;' . $crlf; + $triggerQuery .= $delimiter . $crlf . 'DELIMITER ;' . $crlf; } // One warning per table. From 81831e6d54bc9a49358eae2413dd1fc2a6f198c4 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Tue, 2 Apr 2024 03:43:40 +0000 Subject: [PATCH 04/14] Translated using Weblate (Kabyle) Currently translated at 2.3% (79 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/kab/ Signed-off-by: ButterflyOfFire --- po/kab.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/kab.po b/po/kab.po index 9c8a757201..f656a57bb6 100644 --- a/po/kab.po +++ b/po/kab.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2017-12-31 18:48+0000\n" -"Last-Translator: Slimane Amiri \n" -"Language-Team: Kabyle \n" +"Language-Team: Kabyle \n" "Language: kab\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.19-dev\n" +"X-Generator: Weblate 5.5-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -4267,9 +4267,8 @@ msgid "OpenDocument Spreadsheet" msgstr "Ambellez OpenDocument" #: libraries/classes/Config/Forms/User/ExportForm.php:126 -#, fuzzy msgid "OpenDocument Text" -msgstr "Aḍris OpenDocument " +msgstr "Aḍris OpenDocument" #: libraries/classes/Config/Forms/User/ExportForm.php:153 #: libraries/classes/Controllers/JavaScriptMessagesController.php:372 @@ -9648,9 +9647,8 @@ msgid "" msgstr "" #: libraries/classes/Normalization.php:253 -#, fuzzy msgid "split into " -msgstr "~Gzem..." +msgstr "gzem ɣef " #: libraries/classes/Normalization.php:275 msgid "Have a primary key" From 1529249a284654d063e6e0a6cf9d365139afc48a Mon Sep 17 00:00:00 2001 From: Andrei Stepanov Date: Wed, 3 Apr 2024 04:35:01 +0000 Subject: [PATCH 05/14] Translated using Weblate (Russian) Currently translated at 100.0% (3427 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ru/ Signed-off-by: Andrei Stepanov --- po/ru.po | 69 ++++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 40 deletions(-) diff --git a/po/ru.po b/po/ru.po index 94b6a07074..eef3c7e468 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2024-03-26 11:09+0000\n" +"PO-Revision-Date: 2024-04-04 05:01+0000\n" "Last-Translator: Andrei Stepanov \n" "Language-Team: Russian \n" @@ -2249,7 +2249,7 @@ msgid "" "([kbd]-1[/kbd] for no limit and [kbd]0[/kbd] for no change)." msgstr "" "Максимальное количество байт, которые могут быть выделены скрипту. Пример: " -"[kbd]32M[/kbd] ([kbd]-1[/kbd] - без ограничений, [kbd]0[/kbd] - без " +"[kbd]32M[/kbd] ([kbd]-1[/kbd] — без ограничений, [kbd]0[/kbd] — без " "изменения)." #: libraries/classes/Config/Descriptions.php:291 @@ -5052,7 +5052,7 @@ msgstr "Отображение строк %1$s - %2$s." #, php-format msgid "" "There already exists a page named \"%s\" please rename it to something else." -msgstr "Страница с именем \"%s\" уже существует. Пожалуйста, переименуйте её." +msgstr "Страница с именем «%s» уже существует. Пожалуйста, переименуйте её." #: libraries/classes/Controllers/Database/ExportController.php:81 #: libraries/classes/Controllers/Database/TrackingController.php:130 @@ -5348,8 +5348,8 @@ msgid "" "key was automatically generated for you. Please refer to the " "[doc@cfg_blowfish_secret]documentation[/doc]." msgstr "" -"Для шифрования файлов cookie в конфигурационном файле необходим действующий " -"ключ. Временный ключ был автоматически сгенерирован для вас. Обратитесь к " +"Для шифрования куки в конфигурационном файле необходим действующий ключ. " +"Временный ключ был автоматически создан для вас. Пожалуйста, обратитесь к " "[doc@cfg_blowfish_secret]документации[/doc] ." #: libraries/classes/Controllers/HomeController.php:334 @@ -5359,8 +5359,8 @@ msgid "" "necessary. It should only be %d bytes long. Please refer to the " "[doc@cfg_blowfish_secret]documentation[/doc]." msgstr "" -"Ключ шифрования cookie в конфигурационном файле длиннее, чем необходимо. Его " -"длина должна составлять всего %d байт. Обратитесь к " +"Ключ шифрования куки в конфигурационном файле длиннее необходимого. Его " +"длина должна быть всего %d байт. Пожалуйста, обратитесь к " "[doc@cfg_blowfish_secret]документации[/doc] ." #: libraries/classes/Controllers/HomeController.php:352 @@ -8300,34 +8300,24 @@ msgid "The number of joins that did a full scan of the first table." msgstr "Количество запросов-объединений с полным сканированием первой таблицы." #: libraries/classes/Controllers/Server/Status/VariablesController.php:479 -#, 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 потоком в настоящий момент временных " -"таблиц." +"Количество временных таблиц, открытых в настоящее время потоком 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 replica SQL thread has " "retried transactions." msgstr "" -"Количество повторов транзакций репликации подчинённым потоком с момента " -"запуска." +"Общее (с момента запуска) количество повторных попыток транзакций потока SQL " +"реплики репликации." #: libraries/classes/Controllers/Server/Status/VariablesController.php:483 -#, fuzzy -#| msgid "This is ON if this server is a slave that is connected to a master." msgid "This is ON if this server is a replica that is connected to a primary." msgstr "" -"Присваивается значение ON, если данный сервер - подчинённый, подключенный к " -"главному." +"Этот параметр включён, если этот сервер является репликой, подключённой к " +"первичному." #: libraries/classes/Controllers/Server/Status/VariablesController.php:485 msgid "" @@ -9173,8 +9163,8 @@ msgid "" "Error 1045: Access denied for user. Additional error information may be " "available, but is being hidden by the %s configuration directive." msgstr "" -"Ошибка 1045: пользователю отказано в доступе. Дополнительная информация об " -"ошибке может быть доступна, но скрыта директивой конфигурации %s." +"Ошибка 1045: пользователю отказано в доступе. Подробности об ошибке могут " +"быть доступны, но скрыты директивой конфигурации %s." #: libraries/classes/Display/Results.php:897 templates/list_navigator.twig:8 #: templates/list_navigator.twig:13 @@ -10848,6 +10838,9 @@ msgid "" "You have been automatically logged out due to inactivity of %s seconds. Once " "you log in again, you should be able to resume the work where you left off." msgstr "" +"Вы автоматически вышли из системы из-за бездействия в течение %s секунд. " +"Когда вы снова войдёте в систему, вы сможете продолжить работу с того места, " +"на котором остановились." #: libraries/classes/Plugins/AuthenticationPlugin.php:202 #: libraries/classes/Plugins/AuthenticationPlugin.php:205 @@ -15568,10 +15561,10 @@ msgid "" "formatting strings. Additionally the following transformations will happen: " "%s Other text will be kept as is. See the FAQ 6.27 for details." msgstr "" -"Это значение обрабатывается функцией 'strftime', так что вы можете " +"Это значение обрабатывается функцией «strftime», так что вы можете " "использовать строки форматирования времени. Дополнительно следующие " "преобразования будут применены: %s. Остальной текст останется без изменений. " -"Подробности смотрите в FAQ 6.27." +"Подробности смотрите в ЧаВо 6.27." #: templates/export.twig:398 msgid "Use this for future exports" @@ -16248,6 +16241,8 @@ msgid "" "These functions are meant to return a binary result; to avoid inconsistent " "results you should store it in a BINARY, VARBINARY, or BLOB column." msgstr "" +"Эти функции возвращают двоичный результат; чтобы избежать противоречивых " +"результатов, его следует хранить в столбце BINARY, VARBINARY или BLOB." #: templates/login/form.twig:58 templates/login/form.twig:117 #: templates/login/form.twig:121 templates/login/form.twig:124 @@ -16330,7 +16325,7 @@ msgstr "Устарело!" msgid "" "The FIDO U2F API has been deprecated in favor of the Web Authentication API " "(WebAuthn)." -msgstr "" +msgstr "API FIDO U2F был упразднён в пользу API веб-аутентификации (WebAuthn)." #: templates/login/twofactor/key_configure.twig:6 #: templates/login/twofactor/key.twig:6 @@ -16340,6 +16335,9 @@ msgid "" "API, however it's recommended that you use the WebAuthn authentication " "instead." msgstr "" +"Вы по-прежнему можете использовать Firefox для аутентификации своей учётной " +"записи с помощью FIDO U2F API. Однако вместо этого рекомендуется " +"использовать аутентификацию WebAuthn." #: templates/login/twofactor/key_configure.twig:10 msgid "" @@ -16618,15 +16616,11 @@ msgstr "" "записи." #: templates/preferences/two_factor/main.twig:26 -#, fuzzy -#| msgid "" -#| "Two-factor authentication is not available, please install optional " -#| "dependencies to enable authentication backends." msgid "" "Please install optional dependencies to enable more authentication backends." msgstr "" -"Двухфакторная аутентификация недоступна, установите дополнительные " -"зависимости, чтобы включить внутренние компоненты аутентификации." +"Пожалуйста, установите дополнительные зависимости, чтобы включить больше " +"внутренних компонентов аутентификации." #: templates/preferences/two_factor/main.twig:37 msgid "" @@ -17519,19 +17513,14 @@ msgstr "" "файла my.cnf, после чего перезапустите сервер MySQL." #: 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 is 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 is " "configured as primary." msgstr "" "Сразу после перезапуска MySQL сервера, пожалуйста, нажмите кнопку OK, после " -"чего вы должны увидеть сообщение указывающее, что данный сервер " -"настроен как ведущий." +"чего вы должны увидеть сообщение, указывающее, что этот сервер " +"настроен как первичный." #: templates/server/replication/primary_replication.twig:5 msgid "This server is configured as primary in a replication process." From 60be3d9510809ddb49ab89f657742a577ef8fd16 Mon Sep 17 00:00:00 2001 From: Andrei Stepanov Date: Thu, 4 Apr 2024 18:50:51 +0000 Subject: [PATCH 06/14] Translated using Weblate (Russian) Currently translated at 100.0% (3427 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ru/ Signed-off-by: Andrei Stepanov --- po/ru.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/ru.po b/po/ru.po index eef3c7e468..dc46196af8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2024-04-04 05:01+0000\n" +"PO-Revision-Date: 2024-04-05 19:01+0000\n" "Last-Translator: Andrei Stepanov \n" "Language-Team: Russian \n" @@ -965,7 +965,7 @@ msgstr "Отключен InnoDB?" #: libraries/advisory_rules_generic.php:603 msgid "You do not have InnoDB enabled." -msgstr "У вас выключен InnoDB." +msgstr "У вас отключён InnoDB." #: libraries/advisory_rules_generic.php:604 msgid "InnoDB is usually the better choice for table engines." @@ -1787,9 +1787,9 @@ msgid "" "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" msgstr "" -"В конфигурации PHP включен несовместимый с phpMyAdmin параметр mbstring." -"func_overload. Для предотвращения возможной потери данных данный параметр " -"должен быть выключен!" +"В конфигурации PHP включён несовместимый с phpMyAdmin параметр " +"mbstring.func_overload. Для предотвращения возможной потери данных данный " +"параметр должен быть отключён!" #: libraries/classes/Common.php:569 msgid "" @@ -12651,7 +12651,7 @@ msgstr "Дефрагментировать кеш запросов" #: libraries/classes/Server/Status/Processes.php:110 msgid "ID" -msgstr "ID" +msgstr "ИД" #: libraries/classes/Server/Status/Processes.php:118 #: templates/server/replication/primary_add_replica_user.twig:32 @@ -12982,7 +12982,7 @@ msgstr "Слежение за %1$s было включено на версии % #: libraries/classes/Tracking.php:880 #, php-format msgid "Tracking for %1$s was deactivated at version %2$s." -msgstr "Слежение за %1$s было выключено на версии %2$s." +msgstr "Слежение за %1$s было отключено на версии %2$s." #: libraries/classes/Tracking.php:979 #, php-format @@ -14583,7 +14583,7 @@ msgstr "ВКЛЮЧИТЬ" #: templates/database/events/index.twig:143 msgid "OFF" -msgstr "ВЫКЛЮЧИТЬ" +msgstr "ОТКЛЮЧИТЬ" #: templates/database/export/index.twig:61 msgid "" @@ -15248,7 +15248,7 @@ msgstr "Слежение включено." #: templates/database/structure/tracking_icon.twig:5 msgid "Tracking is not active." -msgstr "Слежение выключено." +msgstr "Слежение отключено." #: templates/database/tracking/tables.twig:4 msgid "Tracked tables" @@ -15276,7 +15276,7 @@ msgstr "включено" #: templates/database/tracking/tables.twig:73 #: templates/table/tracking/main.twig:12 templates/table/tracking/main.twig:56 msgid "not active" -msgstr "выключено" +msgstr "отключено" #: templates/database/tracking/tables.twig:93 #: templates/database/tracking/tables.twig:138 @@ -16872,7 +16872,7 @@ msgstr "Позиция" #: templates/server/binlog/index.twig:87 #: templates/server/replication/primary_replication.twig:24 msgid "Server ID" -msgstr "ID сервера" +msgstr "ИД сервера" #: templates/server/binlog/index.twig:88 msgid "Original position" @@ -17853,7 +17853,7 @@ msgstr "" "Включение директивы general_log может увеличить нагрузку на сервер на 5-15%. " "Имейте в виду, что генерирование статистики из журналов является интенсивной " "задачей для сервера, поэтому советуем выбирать небольшой промежуток времени " -"и выключать general_log и очищать его таблицу после окончания мониторинга." +"и отключать general_log и очищать его таблицу по окончании мониторинга." #: templates/server/status/monitor/index.twig:128 #: templates/server/status/monitor/index.twig:134 @@ -18962,11 +18962,11 @@ msgstr "Включить" #: templates/table/tracking/main.twig:106 #, php-format msgid "Deactivate tracking for %s" -msgstr "Выключить слежение за %s" +msgstr "Отключить слежение за %s" #: templates/table/tracking/main.twig:108 msgid "Deactivate now" -msgstr "Выключить" +msgstr "Отключить сейчас" #: templates/table/tracking/report_table.twig:4 #: templates/table/tracking/structure_snapshot_columns.twig:5 From 091e1765871395120650be67eff5400b4c8e698c Mon Sep 17 00:00:00 2001 From: yangyangdaji <1504305527@qq.com> Date: Tue, 9 Apr 2024 00:55:17 +0000 Subject: [PATCH 07/14] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (3427 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/zh_Hans/ Signed-off-by: yangyangdaji <1504305527@qq.com> --- po/zh_CN.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 016eb29621..8d35801137 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2024-01-16 15:06+0000\n" +"PO-Revision-Date: 2024-04-10 01:01+0000\n" "Last-Translator: yangyangdaji <1504305527@qq.com>\n" "Language-Team: Chinese (Simplified) \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.4-dev\n" +"X-Generator: Weblate 5.5-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -5102,7 +5102,7 @@ msgstr "您将要完全删除一个数据库！" #: libraries/classes/Controllers/JavaScriptMessagesController.php:43 msgid "Cannot rename database to the same name. Change the name and try again." -msgstr "数据库名称已存在。请更换名字再试。" +msgstr "数据库名称已存在. 请更换名字再试。" #: libraries/classes/Controllers/JavaScriptMessagesController.php:45 msgid "You are about to DESTROY a complete table!" From 6278f769c5051d5466b67b2e61eae14ebeac7aad Mon Sep 17 00:00:00 2001 From: Andrei Stepanov Date: Wed, 10 Apr 2024 12:06:31 +0000 Subject: [PATCH 08/14] Translated using Weblate (Russian) Currently translated at 100.0% (3427 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ru/ Signed-off-by: Andrei Stepanov --- po/ru.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index dc46196af8..9bebe905ff 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2024-04-05 19:01+0000\n" +"PO-Revision-Date: 2024-04-11 13:01+0000\n" "Last-Translator: Andrei Stepanov \n" "Language-Team: Russian \n" @@ -6081,7 +6081,7 @@ msgstr "Пожалуйста, добавьте в серию хотя бы од #: templates/table/zoom_search/index.twig:62 #: templates/table/zoom_search/index.twig:122 msgid "None" -msgstr "Ни одного" +msgstr "Нет" #. l10n: SQL Query on modal to show exported query #: libraries/classes/Controllers/JavaScriptMessagesController.php:209 @@ -15382,7 +15382,7 @@ msgstr "В буфер обмена" #: templates/display/results/table.twig:279 #: templates/table/chart/tbl_chart.twig:2 msgid "Display chart" -msgstr "Отобразить график" +msgstr "Показать график" #: templates/display/results/table.twig:287 msgid "Visualize GIS data" @@ -18253,7 +18253,7 @@ msgstr "Связать параметры" #: templates/sql/query.twig:84 msgid "Bookmark this SQL query:" -msgstr "Создание закладки SQL запроса:" +msgstr "Создание закладки SQL-запроса:" #: templates/sql/query.twig:100 msgid "Replace existing bookmark of same name" @@ -18265,7 +18265,7 @@ msgstr "Разделитель" #: templates/sql/query.twig:119 msgid "Show this query here again" -msgstr "Показать данный запрос снова" +msgstr "Показать этот запрос снова" #: templates/sql/query.twig:134 msgid "Rollback when finished" From 96a533d417d428b827763f768f1a362df5ce58f8 Mon Sep 17 00:00:00 2001 From: BahmanMD Date: Sat, 13 Apr 2024 18:34:05 +0000 Subject: [PATCH 09/14] Translated using Weblate (Persian) Currently translated at 23.1% (795 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/fa/ Signed-off-by: BahmanMD --- po/fa.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/fa.po b/po/fa.po index 59216faa58..5a3b6b3ec2 100644 --- a/po/fa.po +++ b/po/fa.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2023-05-04 20:49+0000\n" -"Last-Translator: M \n" +"PO-Revision-Date: 2024-04-14 08:20+0000\n" +"Last-Translator: BahmanMD \n" "Language-Team: Persian \n" "Language: fa\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.18-dev\n" +"X-Generator: Weblate 5.5-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -85,9 +85,8 @@ msgid "The slow query rate should be below 5%%, your value is %s%%." msgstr "نرخ پرس و جو کُند باید کمتر از%% باشد، مقدار شما %s%% می‌باشد." #: libraries/advisory_rules_generic.php:50 -#, fuzzy msgid "Slow query rate" -msgstr "پرس و جوي SQL" +msgstr "نرخ پرس و جوی کُند" #: libraries/advisory_rules_generic.php:54 msgid "" From 698a29510520860eb7823a7f4034141ac67539b3 Mon Sep 17 00:00:00 2001 From: Andrei Stepanov Date: Sun, 14 Apr 2024 10:01:41 +0000 Subject: [PATCH 10/14] Translated using Weblate (Russian) Currently translated at 100.0% (3427 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ru/ Signed-off-by: Andrei Stepanov --- po/ru.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9bebe905ff..73349ee810 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2024-04-11 13:01+0000\n" +"PO-Revision-Date: 2024-04-14 18:56+0000\n" "Last-Translator: Andrei Stepanov \n" "Language-Team: Russian \n" @@ -2384,7 +2384,7 @@ msgid "" "database server" msgstr "" "Укажите, какую временную зону следует использовать. Временная зона может " -"отличаться от зоны на сервере." +"отличаться от зоны на сервере" #: libraries/classes/Config/Descriptions.php:348 msgid "" @@ -15412,8 +15412,8 @@ msgid "" "Can you tell us the steps leading to this error? It decisively helps in " "debugging:" msgstr "" -"Вы можете указать шаги, приведшие к этой ошибке? Это существенно поможет при " -"выяснении причин проблемы." +"Можете указать шаги, приведшие к этой ошибке? Это существенно поможет в " +"отладке:" #: templates/error/report_form.twig:18 msgid "You may examine the data in the error report:" From add463dfe0852e400dfddc5c82b7f64ef961bc30 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 17 Apr 2024 21:15:24 +0200 Subject: [PATCH 11/14] Ref #19112, #19114 - Prevent upgrade to Twig 3.9.0 Signed-off-by: William Desportes --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8bca1b16a8..0f0901920b 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,7 @@ "symfony/polyfill-ctype": "^1.17.0", "symfony/polyfill-mbstring": "^1.17.0", "symfony/polyfill-php80": "^1.16", - "twig/twig": "^3.3.5", + "twig/twig": "^3.3.5 <3.9.0", "webmozart/assert": "^1.10", "williamdes/mariadb-mysql-kbs": "^1.2" }, From 8ea8e1b31f45704ab09ce03496f4adbf77e173e0 Mon Sep 17 00:00:00 2001 From: Petri Salo Date: Fri, 19 Apr 2024 09:07:38 +0000 Subject: [PATCH 12/14] Translated using Weblate (Finnish) Currently translated at 60.9% (2090 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/fi/ Signed-off-by: Petri Salo --- po/fi.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/fi.po b/po/fi.po index 2d571be2ce..35ca04c6cb 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" -"PO-Revision-Date: 2024-01-14 12:31+0000\n" -"Last-Translator: Cum Sock \n" +"PO-Revision-Date: 2024-04-19 15:55+0000\n" +"Last-Translator: Petri Salo \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.4-dev\n" +"X-Generator: Weblate 5.5-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -10424,7 +10424,7 @@ msgstr "Sarake" #: libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php:38 msgctxt "Create new database" msgid "New" -msgstr "" +msgstr "Uusi" #: libraries/classes/Navigation/Nodes/NodeDatabase.php:42 #, fuzzy @@ -10484,7 +10484,7 @@ msgstr "Proseduurit" #: libraries/classes/Navigation/Nodes/NodeProcedureContainer.php:33 msgctxt "Create new procedure" msgid "New" -msgstr "" +msgstr "Uusi" #: libraries/classes/Navigation/Nodes/NodeProcedure.php:28 #, fuzzy @@ -10495,7 +10495,7 @@ msgstr "Proseduurit" #: libraries/classes/Navigation/Nodes/NodeTableContainer.php:34 msgctxt "Create new table" msgid "New" -msgstr "" +msgstr "Uusi" #: libraries/classes/Navigation/Nodes/NodeTriggerContainer.php:33 msgctxt "Create new trigger" From a065218a47552fd14a32d5debd3f5292bbdd6db0 Mon Sep 17 00:00:00 2001 From: Niilo Poutanen Date: Fri, 19 Apr 2024 09:07:59 +0000 Subject: [PATCH 13/14] Translated using Weblate (Finnish) Currently translated at 60.9% (2090 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/fi/ Signed-off-by: Niilo Poutanen --- po/fi.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/fi.po b/po/fi.po index 35ca04c6cb..8c7447c848 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-11-12 15:23-0300\n" "PO-Revision-Date: 2024-04-19 15:55+0000\n" -"Last-Translator: Petri Salo \n" +"Last-Translator: Niilo Poutanen \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -10386,7 +10386,7 @@ msgstr "Sarakkeet" #: libraries/classes/Navigation/Nodes/NodeColumnContainer.php:33 msgctxt "Create new column" msgid "New" -msgstr "" +msgstr "Uusi" #: libraries/classes/Navigation/Nodes/NodeColumn.php:32 #: libraries/classes/Plugins/Export/ExportHtmlword.php:272 @@ -10441,7 +10441,7 @@ msgstr "Näytä vihje" #: libraries/classes/Navigation/Nodes/NodeEventContainer.php:33 msgctxt "Create new event" msgid "New" -msgstr "" +msgstr "Uusi" #: libraries/classes/Navigation/Nodes/NodeEvent.php:28 #: libraries/classes/Plugins/Export/ExportHtmlword.php:475 @@ -10463,12 +10463,12 @@ msgstr "Funktiot" #: libraries/classes/Navigation/Nodes/NodeFunctionContainer.php:33 msgctxt "Create new function" msgid "New" -msgstr "" +msgstr "Uusi" #: libraries/classes/Navigation/Nodes/NodeIndexContainer.php:33 msgctxt "Create new index" msgid "New" -msgstr "" +msgstr "Uusi" #: libraries/classes/Navigation/Nodes/Node.php:630 msgid "Expand/Collapse" @@ -10500,7 +10500,7 @@ msgstr "Uusi" #: libraries/classes/Navigation/Nodes/NodeTriggerContainer.php:33 msgctxt "Create new trigger" msgid "New" -msgstr "" +msgstr "Uusi" #: libraries/classes/Navigation/Nodes/NodeTrigger.php:28 #, fuzzy @@ -10518,7 +10518,7 @@ msgstr "Näkymät" #: libraries/classes/Navigation/Nodes/NodeViewContainer.php:34 msgctxt "Create new view" msgid "New" -msgstr "" +msgstr "Uusi" #: libraries/classes/Normalization.php:223 msgid "Make all columns atomic" @@ -12350,7 +12350,7 @@ msgstr "Isäntäpalvelimen kahdennus" #: libraries/classes/ReplicationGui.php:461 msgid "Success." -msgstr "" +msgstr "Onnistui." #: libraries/classes/ReplicationGui.php:462 #, fuzzy @@ -14028,7 +14028,7 @@ msgstr "Pakkaus" #: templates/columns_definitions/column_attributes.twig:186 msgid "first" -msgstr "" +msgstr "ensimmäinen" #: templates/columns_definitions/column_attributes.twig:191 #: templates/table/structure/display_structure.twig:450 @@ -15351,7 +15351,7 @@ msgstr "Valitut:" #: templates/table/privileges/index.twig:134 msgctxt "Create new user" msgid "New" -msgstr "" +msgstr "Uusi" #: templates/database/privileges/index.twig:136 #: templates/server/privileges/add_user_fieldset.twig:9 @@ -17045,7 +17045,7 @@ msgstr "" #: templates/login/twofactor.twig:10 msgid "Verify" -msgstr "" +msgstr "Todenna" #: templates/login/twofactor/webauthn_creation.twig:1 msgid "" @@ -17741,7 +17741,7 @@ msgstr "Tuonti nykyiselle palvalimelle" #: templates/server/plugins/index.twig:26 msgid "Plugin" -msgstr "" +msgstr "Lisäosa" #: templates/server/plugins/index.twig:28 templates/table/tracking/main.twig:28 msgid "Version" @@ -19307,7 +19307,7 @@ msgstr "Muokkaus" #: templates/table/chart/tbl_chart.twig:29 msgctxt "Chart type" msgid "Area" -msgstr "" +msgstr "Alue" #: templates/table/chart/tbl_chart.twig:33 #, fuzzy @@ -20006,7 +20006,7 @@ msgstr "Esitä taulun rakenne" #: templates/table/structure/display_structure.twig:420 msgid "Normalize" -msgstr "" +msgstr "Normalisoi" #: templates/table/structure/display_structure.twig:426 #, fuzzy From de45958d544b5f0bfb1cd04f6a3f886b3e70c3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 19 Apr 2024 14:25:24 -0300 Subject: [PATCH 14/14] Allow installation of Twig >= 3.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fixes #19112 Signed-off-by: Maurício Meneghini Fauth --- composer.json | 2 +- phpstan-baseline.neon | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0f0901920b..8bca1b16a8 100644 --- a/composer.json +++ b/composer.json @@ -73,7 +73,7 @@ "symfony/polyfill-ctype": "^1.17.0", "symfony/polyfill-mbstring": "^1.17.0", "symfony/polyfill-php80": "^1.16", - "twig/twig": "^3.3.5 <3.9.0", + "twig/twig": "^3.3.5", "webmozart/assert": "^1.10", "williamdes/mariadb-mysql-kbs": "^1.2" }, diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 801f447ec2..6c2afd46c7 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1565,6 +1565,11 @@ parameters: count: 1 path: libraries/classes/Controllers/Table/ReplaceController.php + - + message: "#^Variable \\$extra_data might not be defined\\.$#" + count: 1 + path: libraries/classes/Controllers/Table/ReplaceController.php + - message: "#^Method PhpMyAdmin\\\\Controllers\\\\Table\\\\SearchController\\:\\:getColumnMinMax\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1