From 113254cb78427f88fed1c5c9ee13a6aa0d2f0c2b Mon Sep 17 00:00:00 2001 From: Kristijan Fremen Velkovski Date: Wed, 30 Nov 2022 01:38:14 +0000 Subject: [PATCH 1/5] Translated using Weblate (Macedonian) Currently translated at 22.6% (773 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 | 58 ++++++++++++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/po/mk.po b/po/mk.po index d690e71a57..e4e1abab47 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2022-09-29 00:17-0300\n" -"PO-Revision-Date: 2022-11-28 18:47+0000\n" +"PO-Revision-Date: 2022-12-01 01:48+0000\n" "Last-Translator: Kristijan Fremen Velkovski \n" "Language-Team: Macedonian \n" @@ -6006,10 +6006,9 @@ msgstr "Исклучи %s" #. l10n: %d seconds #: libraries/classes/Controllers/JavaScriptMessagesController.php:238 -#, fuzzy, php-format -#| msgid "Query took %01.4f sec" +#, php-format msgid "Set long_query_time to %d seconds." -msgstr "време на извршување на упитот %01.4f секунди" +msgstr "Подеси long_query_time на %d секунди." #: libraries/classes/Controllers/JavaScriptMessagesController.php:240 msgid "" @@ -6500,10 +6499,9 @@ msgid "No routine is exportable. Required privileges may be lacking." msgstr "" #: libraries/classes/Controllers/JavaScriptMessagesController.php:377 -#, fuzzy, php-format -#| msgid "Number of rows per page" +#, php-format msgid "Values for column %s" -msgstr "Број на записи на страница" +msgstr "Вредности за колона %s" #: libraries/classes/Controllers/JavaScriptMessagesController.php:378 msgid "Values for a new column" @@ -6514,9 +6512,9 @@ msgid "Enter each value in a separate field." msgstr "" #: libraries/classes/Controllers/JavaScriptMessagesController.php:380 -#, fuzzy, php-format +#, php-format msgid "Add %d value(s)" -msgstr "Додади нов корисник" +msgstr "Додади %d вредност(и)" #: libraries/classes/Controllers/JavaScriptMessagesController.php:383 msgid "" @@ -7283,9 +7281,9 @@ msgid "Some error occurred while getting SQL debug info." msgstr "" #: libraries/classes/Controllers/JavaScriptMessagesController.php:656 -#, fuzzy, php-format +#, php-format msgid "%s queries executed %s times in %s seconds." -msgstr "SQL упит" +msgstr "%s барања извршени %s пати во %s секунди." #: libraries/classes/Controllers/JavaScriptMessagesController.php:657 #, php-format @@ -8197,9 +8195,9 @@ msgstr "" #: libraries/classes/Controllers/Table/Structure/PartitioningController.php:275 #: libraries/classes/Controllers/Table/Structure/SaveController.php:223 #: libraries/classes/Table/Indexes.php:85 -#, fuzzy, php-format +#, php-format msgid "Table %1$s has been altered successfully." -msgstr "Изабраните корисници успешно се избришани." +msgstr "Табелата %1$s беше успешно променета." #: libraries/classes/Controllers/Table/ChangeRowsController.php:36 #: libraries/classes/Controllers/Table/DeleteConfirmController.php:25 @@ -8393,10 +8391,10 @@ msgstr[0] "" msgstr[1] "" #: libraries/classes/Controllers/Table/Structure/SaveController.php:218 -#, fuzzy, php-format +#, php-format msgid "" "Table %1$s has been altered successfully. Privileges have been adjusted." -msgstr "Изабраните корисници успешно се избришани." +msgstr "Табелата %1$s беше успешно променета. Привилегиите се прилагодени." #: libraries/classes/Controllers/Table/TrackingController.php:69 #, php-format @@ -8573,15 +8571,14 @@ msgid "MySQL said: " msgstr "MySQL порака: " #: libraries/classes/Database/Events.php:126 -#, fuzzy, php-format -#| msgid "Table %s has been dropped." +#, php-format msgid "Event %1$s has been modified." -msgstr "Табелата %s е избришана" +msgstr "Настанот %1$s беше променет." #: libraries/classes/Database/Events.php:146 -#, fuzzy, php-format +#, php-format msgid "Event %1$s has been created." -msgstr "Табелата %s е избришана" +msgstr "Настанот %1$s беше создаден" #: libraries/classes/Database/Events.php:160 #: libraries/classes/Database/Routines.php:266 @@ -8644,23 +8641,22 @@ msgid "Error in processing request:" msgstr "Грешка при процесирање на барањето:" #: libraries/classes/Database/Events.php:536 -#, fuzzy, php-format -#| msgid "No tables found in database." +#, php-format msgid "No event with name %1$s found in database %2$s." -msgstr "Табелите не се пронајдени во базата на податоци." +msgstr "Нема настан со име %1$s најден во датабазата %2$s." #: libraries/classes/Database/Events.php:568 -#, fuzzy, php-format -#| msgid "No rows selected" +#, php-format msgid "Export of event %s" -msgstr "Нема селектирани записи" +msgstr "Извоз на настан %s" #: libraries/classes/Database/Events.php:589 -#, fuzzy, php-format -#| msgid "No tables found in database." +#, php-format msgid "" "Error in processing request: No event with name %1$s found in database %2$s." -msgstr "Табелите не се пронајдени во базата на податоци." +msgstr "" +"Грешка при процесирање на барањето: Нема настан со име %1$s најден во " +"датабазата %2$s." #: libraries/classes/DatabaseInterface.php:1130 #, php-format @@ -8761,9 +8757,9 @@ msgid "Invalid routine type: \"%s\"" msgstr "" #: libraries/classes/Database/Routines.php:253 -#, fuzzy, php-format +#, php-format msgid "Routine %1$s has been created." -msgstr "Табелата %s е избришана" +msgstr "Рутината %1$s беше создадена." #: libraries/classes/Database/Routines.php:413 #, fuzzy, php-format From 24e10866824af40e375b644404f290e5f68143fd Mon Sep 17 00:00:00 2001 From: Kristijan Fremen Velkovski Date: Thu, 1 Dec 2022 04:34:58 +0000 Subject: [PATCH 2/5] Translated using Weblate (Macedonian) Currently translated at 23.0% (787 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 | 59 ++++++++++++++++---------------------------------------- 1 file changed, 17 insertions(+), 42 deletions(-) diff --git a/po/mk.po b/po/mk.po index e4e1abab47..d1851872f8 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2022-09-29 00:17-0300\n" -"PO-Revision-Date: 2022-12-01 01:48+0000\n" +"PO-Revision-Date: 2022-12-02 04:48+0000\n" "Last-Translator: Kristijan Fremen Velkovski \n" "Language-Team: Macedonian \n" @@ -11017,10 +11017,8 @@ msgid "" msgstr "" #: libraries/classes/Plugins/Export/ExportSql.php:265 -#, fuzzy -#| msgid "Statements" msgid "Add statements:" -msgstr "Име" +msgstr "Додај изјави:" #: libraries/classes/Plugins/Export/ExportSql.php:273 #: libraries/classes/Plugins/Export/ExportSql.php:282 @@ -11160,23 +11158,18 @@ msgstr "Создадено:" #: libraries/classes/Plugins/Export/ExportSql.php:1468 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:642 -#, fuzzy -#| msgid "Last update" msgid "Last update:" -msgstr "Последна измена" +msgstr "Последна измена:" #: libraries/classes/Plugins/Export/ExportSql.php:1478 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:653 -#, fuzzy -#| msgid "Last check" msgid "Last check:" -msgstr "Последна проверка" +msgstr "Последна проверка:" #: libraries/classes/Plugins/Export/ExportSql.php:1529 -#, fuzzy, php-format -#| msgid "Table structure for table" +#, php-format msgid "Error reading structure for table %s:" -msgstr "Структура на табелата" +msgstr "Грешка при читање на структура на табелата %s:" #: libraries/classes/Plugins/Export/ExportSql.php:1611 msgid "It appears your database uses views;" @@ -11197,10 +11190,8 @@ msgid "Indexes for dumped tables" msgstr "Ограничувања за извезените табели" #: libraries/classes/Plugins/Export/ExportSql.php:1807 -#, fuzzy -#| msgid "Inside table(s):" msgid "Indexes for table" -msgstr "во табела(и):" +msgstr "Индекси за табелата" #: libraries/classes/Plugins/Export/ExportSql.php:1843 #, fuzzy @@ -11240,10 +11231,9 @@ msgid "(See below for the actual view)" msgstr "" #: libraries/classes/Plugins/Export/ExportSql.php:2237 -#, fuzzy, php-format -#| msgid "Allows reading data." +#, php-format msgid "Error reading data for table %s:" -msgstr "Дозволува читање на податоци." +msgstr "Грешка при читање на податоци за табелата %s:" #: libraries/classes/Plugins/Export/ExportXml.php:94 msgid "Object creation options (all are recommended)" @@ -11255,10 +11245,8 @@ msgstr "" #: libraries/classes/Plugins/Export/Helpers/Pdf.php:202 #: templates/menu/breadcrumbs.twig:29 -#, fuzzy -#| msgid "Table" msgid "Table:" -msgstr "Табела" +msgstr "Табела:" #: libraries/classes/Plugins/Export/Helpers/Pdf.php:203 msgid "Purpose:" @@ -11297,10 +11285,8 @@ msgid "" msgstr "" #: libraries/classes/Plugins/Import/ImportCsv.php:134 -#, fuzzy -#| msgid "Column names" msgid "Column names:" -msgstr "Имиња на колони" +msgstr "Имиња на колони:" #: libraries/classes/Plugins/Import/ImportCsv.php:272 #: libraries/classes/Plugins/Import/ImportCsv.php:631 @@ -11387,10 +11373,8 @@ msgid "The imported file does not contain any data!" msgstr "" #: libraries/classes/Plugins/Import/ImportSql.php:65 -#, fuzzy -#| msgid "MySQL 4.0 compatible" msgid "SQL compatibility mode:" -msgstr "MySQL 4.0 компатибилно" +msgstr "SQL компатибилен мод:" #: libraries/classes/Plugins/Import/ImportSql.php:77 msgid "Do not use AUTO_INCREMENT for zero values" @@ -12631,10 +12615,8 @@ msgid "Problems with indexes of table `%s`" msgstr "Проблем при индексирање на табелата `%s`" #: libraries/classes/Table.php:348 -#, fuzzy -#| msgid "Show tables" msgid "Unknown table status:" -msgstr "Прикажи табели" +msgstr "Непознат статус на табела:" #: libraries/classes/Table.php:1006 #, fuzzy, php-format @@ -12647,9 +12629,8 @@ msgid "Target database `%s` was not found!" msgstr "Пребарување низ базата на податоци" #: libraries/classes/Table.php:1473 -#, fuzzy msgid "Invalid database:" -msgstr "Базата на податоци не постои" +msgstr "Невалидна датабаза:" #: libraries/classes/Table.php:1491 #, fuzzy @@ -13583,22 +13564,16 @@ msgid "column(s)" msgstr "Имиња на колони" #: templates/columns_definitions/column_definitions_form.twig:74 -#, fuzzy -#| msgid "Collation" msgid "Collation:" -msgstr "Подредување" +msgstr "Подредување:" #: templates/columns_definitions/column_definitions_form.twig:77 -#, fuzzy -#| msgid "Storage Engine" msgid "Storage Engine:" -msgstr "Вид на складиште" +msgstr "Мотор на складиште:" #: templates/columns_definitions/column_definitions_form.twig:82 -#, fuzzy -#| msgid "Connections" msgid "Connection:" -msgstr "Конекции" +msgstr "Конекциja:" #: templates/columns_definitions/column_definitions_form.twig:113 #: templates/columns_definitions/partitions.twig:137 From 28d8fdc584ac5427821967bb7ccc16b44e2ec2e4 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 3 Dec 2022 18:34:55 +0100 Subject: [PATCH 3/5] Bump GitHub actions versions and fix deprecated syntax for variables Signed-off-by: William Desportes --- .github/workflows/lint-and-analyse-php.yml | 2 +- .github/workflows/other-tools.yml | 2 +- .github/workflows/test-selenium.yml | 4 ++-- .github/workflows/tests.yml | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lint-and-analyse-php.yml b/.github/workflows/lint-and-analyse-php.yml index a43b539a94..7543dbdd5e 100644 --- a/.github/workflows/lint-and-analyse-php.yml +++ b/.github/workflows/lint-and-analyse-php.yml @@ -25,7 +25,7 @@ jobs: - name: Get Yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Cache Yarn dependencies uses: actions/cache@v3 diff --git a/.github/workflows/other-tools.yml b/.github/workflows/other-tools.yml index 7b255f8393..8427efb261 100644 --- a/.github/workflows/other-tools.yml +++ b/.github/workflows/other-tools.yml @@ -60,7 +60,7 @@ jobs: - name: Get Yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Cache Yarn dependencies uses: actions/cache@v3 diff --git a/.github/workflows/test-selenium.yml b/.github/workflows/test-selenium.yml index ec53b175c0..2ba5fa861b 100644 --- a/.github/workflows/test-selenium.yml +++ b/.github/workflows/test-selenium.yml @@ -88,7 +88,7 @@ jobs: - name: Get Yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Cache Yarn dependencies uses: actions/cache@v3 @@ -111,7 +111,7 @@ jobs: SKIP_STANDALONE: 1 run: | ./test/start-local-server - echo ::set-output name=SELENIUM_TEMPDIR::"$(cat /tmp/last_temp_dir_phpMyAdminTests)" + echo "SELENIUM_TEMPDIR=$(cat /tmp/last_temp_dir_phpMyAdminTests)" >> $GITHUB_OUTPUT id: start-local-server - name: Run Selenium tests diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 693461ef7a..111b64f3dd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -109,7 +109,7 @@ jobs: run: composer run phpunit -- ${{ matrix.phpunit-options }} - name: Send coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 with: flags: unit-${{ matrix.php-version }}-${{ matrix.os }} name: phpunit-${{ matrix.php-version }}-${{ matrix.os }} @@ -168,7 +168,7 @@ jobs: run: composer run phpunit -- --testsuite unit - name: Send coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 with: flags: ${{ matrix.extension }}-extension name: php-7.2-${{ matrix.extension }}-enabled @@ -204,7 +204,7 @@ jobs: - name: Get Yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT - name: Cache Yarn dependencies uses: actions/cache@v3 From 52bcd5005c9cc3736de0ef14e282cb03ae6e36db Mon Sep 17 00:00:00 2001 From: Kristijan Fremen Velkovski Date: Sat, 3 Dec 2022 09:54:00 +0000 Subject: [PATCH 4/5] Translated using Weblate (Macedonian) Currently translated at 23.1% (791 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 | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/po/mk.po b/po/mk.po index d1851872f8..942dda0311 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2022-09-29 00:17-0300\n" -"PO-Revision-Date: 2022-12-02 04:48+0000\n" +"PO-Revision-Date: 2022-12-03 19:53+0000\n" "Last-Translator: Kristijan Fremen Velkovski \n" "Language-Team: Macedonian \n" @@ -8762,16 +8762,14 @@ msgid "Routine %1$s has been created." msgstr "Рутината %1$s беше создадена." #: libraries/classes/Database/Routines.php:413 -#, fuzzy, php-format -#| msgid "Table %s has been dropped." +#, php-format msgid "Routine %1$s has been modified. Privileges have been adjusted." -msgstr "Табелата %s е избришана" +msgstr "Рутината %1$s беше променета. Привилегиите се прилагодени." #: libraries/classes/Database/Routines.php:418 -#, fuzzy, php-format -#| msgid "Table %s has been dropped." +#, php-format msgid "Routine %1$s has been modified." -msgstr "Табелата %s е избришана" +msgstr "Рутината %1$s беше променета." #: libraries/classes/Database/Routines.php:825 msgid "You must provide a name and a type for each routine parameter." @@ -8803,16 +8801,14 @@ msgstr "" #: libraries/classes/Database/Routines.php:1145 #: libraries/classes/Database/Routines.php:1314 -#, fuzzy, php-format -#| msgid "No tables found in database." +#, php-format msgid "No routine with name %1$s found in database %2$s." -msgstr "Табелите не се пронајдени во базата на податоци." +msgstr "Не се најде рутина со име %1$s во датабаза %2$s." #: libraries/classes/Database/Routines.php:1184 -#, fuzzy, php-format -#| msgid "Allows executing stored routines." +#, php-format msgid "Execution results of routine %s" -msgstr "Дозволува извршување на stored рутини." +msgstr "Резултати на извршување на рутина %s" #: libraries/classes/Database/Routines.php:1232 #, php-format From 5a6b5e731f8c7a6c98e8038660ed9b41e7475021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sun, 4 Dec 2022 15:31:07 -0300 Subject: [PATCH 5/5] Bump ramsey/composer-install action's version to v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- .github/workflows/lint-and-analyse-php.yml | 4 ++-- .github/workflows/mutation-tests.yml | 2 +- .github/workflows/other-tools.yml | 2 +- .github/workflows/test-selenium.yml | 2 +- .github/workflows/tests.yml | 4 ++-- .github/workflows/update-po.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/lint-and-analyse-php.yml b/.github/workflows/lint-and-analyse-php.yml index 7543dbdd5e..31083f9a31 100644 --- a/.github/workflows/lint-and-analyse-php.yml +++ b/.github/workflows/lint-and-analyse-php.yml @@ -62,7 +62,7 @@ jobs: run: composer validate --strict - name: Install Composer dependencies - uses: ramsey/composer-install@v1 + uses: ramsey/composer-install@v2 with: dependency-versions: highest # Ignore zip for php-webdriver/webdriver @@ -99,7 +99,7 @@ jobs: extensions: mbstring, iconv, mysqli, zip, gd, bz2 - name: Install Composer dependencies - uses: ramsey/composer-install@v1 + uses: ramsey/composer-install@v2 with: dependency-versions: highest diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml index 17d0da682d..5cb3b839e8 100644 --- a/.github/workflows/mutation-tests.yml +++ b/.github/workflows/mutation-tests.yml @@ -47,7 +47,7 @@ jobs: phive --no-progress install --target ./build/tools --trust-gpg-keys C5095986493B4AA0 infection - name: Install Composer dependencies - uses: ramsey/composer-install@v1 + uses: ramsey/composer-install@v2 with: dependency-versions: highest diff --git a/.github/workflows/other-tools.yml b/.github/workflows/other-tools.yml index 8427efb261..789b5f5d62 100644 --- a/.github/workflows/other-tools.yml +++ b/.github/workflows/other-tools.yml @@ -49,7 +49,7 @@ jobs: tools: composer:v2 - name: Install Composer dependencies - uses: ramsey/composer-install@v1 + uses: ramsey/composer-install@v2 with: dependency-versions: highest diff --git a/.github/workflows/test-selenium.yml b/.github/workflows/test-selenium.yml index 2ba5fa861b..a83671b182 100644 --- a/.github/workflows/test-selenium.yml +++ b/.github/workflows/test-selenium.yml @@ -77,7 +77,7 @@ jobs: extensions: mbstring, iconv, mysqli, zip, gd, bz2 - name: Install Composer dependencies - uses: ramsey/composer-install@v1 + uses: ramsey/composer-install@v2 with: dependency-versions: highest diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 111b64f3dd..b0c4663cc5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,7 +100,7 @@ jobs: coverage: xdebug - name: Install Composer dependencies - uses: ramsey/composer-install@v1 + uses: ramsey/composer-install@v2 with: dependency-versions: highest composer-options: ${{ matrix.composer-options }} @@ -160,7 +160,7 @@ jobs: coverage: xdebug - name: Install Composer dependencies - uses: ramsey/composer-install@v1 + uses: ramsey/composer-install@v2 with: dependency-versions: highest diff --git a/.github/workflows/update-po.yml b/.github/workflows/update-po.yml index a505e41e01..be4ff06318 100644 --- a/.github/workflows/update-po.yml +++ b/.github/workflows/update-po.yml @@ -34,7 +34,7 @@ jobs: tools: composer:v2 - name: Install Composer dependencies - uses: ramsey/composer-install@v1 + uses: ramsey/composer-install@v2 with: dependency-versions: highest