From 8a2fbda34ae37cae622fa37f36fa31bb0c7d4fcf Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 31 Oct 2022 14:27:15 +0100 Subject: [PATCH 1/9] Ref #17028 - Use statement build instead of replacing tokens Signed-off-by: William Desportes --- libraries/classes/Sql.php | 31 +++++++++++++------------------ test/classes/SqlTest.php | 8 ++++---- test/classes/Stubs/DbiDummy.php | 4 ++-- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index 2053d2dbcc..be230338cb 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -736,24 +736,19 @@ class Sql } } else { $statement = $analyzedSqlResults['statement']; - $tokenList = $analyzedSqlResults['parser']->list; - $replaces = [ - // Remove ORDER BY to decrease unnecessary sorting time - [ - 'ORDER BY', - '', - ], - // Removes LIMIT clause that might have been added - [ - 'LIMIT', - '', - ], - ]; - $countQuery = 'SELECT COUNT(*) FROM (' . Query::replaceClauses( - $statement, - $tokenList, - $replaces - ) . ') as cnt'; + + // Remove ORDER BY to decrease unnecessary sorting time + if ($analyzedSqlResults['order'] !== false) { + $statement->order = null; + } + + // Removes LIMIT clause that might have been added + if ($analyzedSqlResults['limit'] !== null) { + $statement->limit = null; + } + + $countQuery = 'SELECT COUNT(*) FROM (' . $statement->build() . ' ) as cnt'; + $unlimNumRows = $this->dbi->fetchValue($countQuery); if ($unlimNumRows === false) { $unlimNumRows = 0; diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php index 70e2d45edf..7ef3c2419d 100644 --- a/test/classes/SqlTest.php +++ b/test/classes/SqlTest.php @@ -370,9 +370,9 @@ class SqlTest extends AbstractTestCase 164056, 50, false, - 'SELECT COUNT(*) FROM (select * from game_auth_logs l join (' + 'SELECT COUNT(*) FROM (SELECT * FROM game_auth_logs AS `l` JOIN (' . ' select al.user_id, max(al.id) as id from game_auth_logs al ' - . 'where al.successfull = 1 group by al.user_id ) last_log on last_log.id = l.id' + . 'where al.successfull = 1 group by al.user_id ) AS `last_log` ON last_log.id = l.id' . ' ) as cnt', ], 'join on SELECT results with alias.*' => [ @@ -384,9 +384,9 @@ class SqlTest extends AbstractTestCase 164056, 50, false, - 'SELECT COUNT(*) FROM (select l.* from game_auth_logs l join (' + 'SELECT COUNT(*) FROM (SELECT l.* FROM game_auth_logs AS `l` JOIN (' . ' select al.user_id, max(al.id) as id from game_auth_logs al ' - . 'where al.successfull = 1 group by al.user_id ) last_log on last_log.id = l.id' + . 'where al.successfull = 1 group by al.user_id ) AS `last_log` ON last_log.id = l.id' . ' ) as cnt', ], [ diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php index e33e553f40..57088b380a 100644 --- a/test/classes/Stubs/DbiDummy.php +++ b/test/classes/Stubs/DbiDummy.php @@ -2782,8 +2782,8 @@ class DbiDummy implements DbiExtension ], [ 'query' => 'SELECT COUNT(*) FROM (' - . 'SELECT *, 1, (SELECT COUNT(*) FROM tbl1) as c1, ' - . '(SELECT 1 FROM tbl2) as c2 FROM company_users WHERE subquery_case = 0 ) as cnt', + . 'SELECT *, 1, (SELECT COUNT(*) FROM tbl1) AS `c1`, ' + . '(SELECT 1 FROM tbl2) AS `c2` FROM company_users WHERE subquery_case = 0 ) as cnt', 'result' => [ [42], ], From 86b93afdfd1a92aac6cd6d1873e5818b24b4c706 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 31 Oct 2022 14:44:40 +0100 Subject: [PATCH 2/9] Replace '*' in query to count results Signed-off-by: William Desportes --- libraries/classes/Sql.php | 6 ++++++ test/classes/SqlTest.php | 4 ++-- test/classes/Stubs/DbiDummy.php | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index be230338cb..8fbb08542d 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -13,6 +13,7 @@ use PhpMyAdmin\Html\Generator; use PhpMyAdmin\Html\MySQLDocumentation; use PhpMyAdmin\Query\Generator as QueryGenerator; use PhpMyAdmin\Query\Utilities; +use PhpMyAdmin\SqlParser\Components\Expression; use PhpMyAdmin\SqlParser\Statements\AlterStatement; use PhpMyAdmin\SqlParser\Statements\DropStatement; use PhpMyAdmin\SqlParser\Statements\SelectStatement; @@ -747,6 +748,11 @@ class Sql $statement->limit = null; } + if ($analyzedSqlResults['is_group'] === false && count($statement->expr) === 1) { + $statement->expr[0] = new Expression(); + $statement->expr[0]->expr = '1'; + } + $countQuery = 'SELECT COUNT(*) FROM (' . $statement->build() . ' ) as cnt'; $unlimNumRows = $this->dbi->fetchValue($countQuery); diff --git a/test/classes/SqlTest.php b/test/classes/SqlTest.php index 7ef3c2419d..aeae52c6e6 100644 --- a/test/classes/SqlTest.php +++ b/test/classes/SqlTest.php @@ -370,7 +370,7 @@ class SqlTest extends AbstractTestCase 164056, 50, false, - 'SELECT COUNT(*) FROM (SELECT * FROM game_auth_logs AS `l` JOIN (' + 'SELECT COUNT(*) FROM (SELECT 1 FROM game_auth_logs AS `l` JOIN (' . ' select al.user_id, max(al.id) as id from game_auth_logs al ' . 'where al.successfull = 1 group by al.user_id ) AS `last_log` ON last_log.id = l.id' . ' ) as cnt', @@ -384,7 +384,7 @@ class SqlTest extends AbstractTestCase 164056, 50, false, - 'SELECT COUNT(*) FROM (SELECT l.* FROM game_auth_logs AS `l` JOIN (' + 'SELECT COUNT(*) FROM (SELECT 1 FROM game_auth_logs AS `l` JOIN (' . ' select al.user_id, max(al.id) as id from game_auth_logs al ' . 'where al.successfull = 1 group by al.user_id ) AS `last_log` ON last_log.id = l.id' . ' ) as cnt', diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php index 57088b380a..2fe4927dab 100644 --- a/test/classes/Stubs/DbiDummy.php +++ b/test/classes/Stubs/DbiDummy.php @@ -2759,17 +2759,17 @@ class DbiDummy implements DbiExtension 'result' => [['hostname', 'username', 'password']], ], [ - 'query' => 'SELECT COUNT(*) FROM (SELECT * FROM company_users WHERE not_working_count != 0 ) as cnt', + 'query' => 'SELECT COUNT(*) FROM (SELECT 1 FROM company_users WHERE not_working_count != 0 ) as cnt', 'result' => false, ], [ - 'query' => 'SELECT COUNT(*) FROM (SELECT * FROM company_users ) as cnt', + 'query' => 'SELECT COUNT(*) FROM (SELECT 1 FROM company_users ) as cnt', 'result' => [ [4], ], ], [ - 'query' => 'SELECT COUNT(*) FROM (SELECT * FROM company_users WHERE working_count = 0 ) as cnt', + 'query' => 'SELECT COUNT(*) FROM (SELECT 1 FROM company_users WHERE working_count = 0 ) as cnt', 'result' => [ [15], ], From b9c593c67d94fcc9903b6688dbc982f50e008998 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 20 Nov 2022 21:32:39 +0100 Subject: [PATCH 3/9] Fix #17766 - Allow to open in a new tab copy and edit row actions Signed-off-by: William Desportes --- .../Controllers/Table/ChangeController.php | 7 ++++ .../Controllers/Table/ReplaceController.php | 2 +- libraries/classes/Display/Results.php | 2 + libraries/classes/InsertEdit.php | 9 +++++ psalm-baseline.xml | 17 +++++++-- test/classes/InsertEditTest.php | 37 +++++++++++++++++++ 6 files changed, 70 insertions(+), 4 deletions(-) diff --git a/libraries/classes/Controllers/Table/ChangeController.php b/libraries/classes/Controllers/Table/ChangeController.php index 11509b14f6..8c971e07f1 100644 --- a/libraries/classes/Controllers/Table/ChangeController.php +++ b/libraries/classes/Controllers/Table/ChangeController.php @@ -6,6 +6,7 @@ namespace PhpMyAdmin\Controllers\Table; use PhpMyAdmin\Config\PageSettings; use PhpMyAdmin\ConfigStorage\Relation; +use PhpMyAdmin\Core; use PhpMyAdmin\DbTableExists; use PhpMyAdmin\Html\Generator; use PhpMyAdmin\InsertEdit; @@ -60,6 +61,12 @@ class ChangeController extends AbstractController DbTableExists::check(); + if (isset($_GET['where_clause'], $_GET['where_clause_signature'])) { + if (Core::checkSqlQuerySignature($_GET['where_clause'], $_GET['where_clause_signature'])) { + $where_clause = $_GET['where_clause']; + } + } + /** * Determine whether Insert or Edit and set global variables */ diff --git a/libraries/classes/Controllers/Table/ReplaceController.php b/libraries/classes/Controllers/Table/ReplaceController.php index a841b1c333..32a7aa66b4 100644 --- a/libraries/classes/Controllers/Table/ReplaceController.php +++ b/libraries/classes/Controllers/Table/ReplaceController.php @@ -379,7 +379,7 @@ final class ReplaceController extends AbstractController $value_sets[] = implode(', ', $query_values); } else { // build update query - $clauseIsUnique = $_POST['clause_is_unique'] ?? '';// Should contain 0 or 1 + $clauseIsUnique = $_POST['clause_is_unique'] ?? $_GET['clause_is_unique'] ?? '';// Should contain 0 or 1 $query[] = 'UPDATE ' . Util::backquote($table) . ' SET ' . implode(', ', $query_values) . ' WHERE ' . $where_clause diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index bb070adbd6..c31a2eea2b 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -2953,8 +2953,10 @@ class Results 'db' => $this->properties['db'], 'table' => $this->properties['table'], 'where_clause' => $whereClause, + 'where_clause_signature' => Core::signSqlQuery($whereClause), 'clause_is_unique' => $clauseIsUnique, 'sql_query' => $urlSqlQuery, + 'sql_signature' => Core::signSqlQuery($urlSqlQuery), 'goto' => Url::getFromRoute('/sql'), ]; diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 3e6ab3e411..d6fb3e8bcb 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -114,6 +114,13 @@ class InsertEdit 'err_url' => $errorUrl, 'sql_query' => $_POST['sql_query'] ?? '', ]; + + if ($formParams['sql_query'] === '' && isset($_GET['sql_query'], $_GET['sql_signature'])) { + if (Core::checkSqlQuerySignature($_GET['sql_query'], $_GET['sql_signature'])) { + $formParams['sql_query'] = $_GET['sql_query']; + } + } + if (isset($whereClauses)) { foreach ($whereClauseArray as $keyId => $whereClause) { $formParams['where_clause[' . $keyId . ']'] = trim($whereClause); @@ -122,6 +129,8 @@ class InsertEdit if (isset($_POST['clause_is_unique'])) { $formParams['clause_is_unique'] = $_POST['clause_is_unique']; + } elseif (isset($_GET['clause_is_unique'])) { + $formParams['clause_is_unique'] = $_GET['clause_is_unique']; } return $formParams; diff --git a/psalm-baseline.xml b/psalm-baseline.xml index ae47a9bebc..0988ffc807 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -3049,9 +3049,16 @@ $biggest_max_file_size $jsvkey - + + $_GET['where_clause'] + $_GET['where_clause_signature'] $current_result + $where_clause ?? null + + $_GET['where_clause'] + $_GET['where_clause_signature'] + $isUpload @@ -8299,13 +8306,17 @@ $whereClause - + + $_GET['sql_query'] + $_GET['sql_signature'] $whereClause $_POST['fields']['multi_edit'] - + + $_GET['sql_query'] + $_GET['sql_signature'] $whereClause diff --git a/test/classes/InsertEditTest.php b/test/classes/InsertEditTest.php index 6bbe885c12..7f4db38000 100644 --- a/test/classes/InsertEditTest.php +++ b/test/classes/InsertEditTest.php @@ -135,6 +135,43 @@ class InsertEditTest extends AbstractTestCase ); } + /** + * Test for getFormParametersForInsertForm + */ + public function testGetFormParametersForInsertFormGet(): void + { + $where_clause = [ + 'foo' => 'bar ', + '1' => ' test', + ]; + $_GET['clause_is_unique'] = false; + $_GET['sql_query'] = 'SELECT a'; + $_GET['sql_signature'] = Core::signSqlQuery($_GET['sql_query']); + $GLOBALS['goto'] = 'index.php'; + + $result = $this->insertEdit->getFormParametersForInsertForm( + 'dbname', + 'tablename', + [], + $where_clause, + 'localhost' + ); + + $this->assertEquals( + [ + 'db' => 'dbname', + 'table' => 'tablename', + 'goto' => 'index.php', + 'err_url' => 'localhost', + 'sql_query' => 'SELECT a', + 'where_clause[foo]' => 'bar', + 'where_clause[1]' => 'test', + 'clause_is_unique' => false, + ], + $result + ); + } + /** * Test for getWhereClauseArray */ From cc7efe3950dbc364789c89103529222ac89baef0 Mon Sep 17 00:00:00 2001 From: Juan Date: Tue, 7 Feb 2023 11:15:41 +0000 Subject: [PATCH 4/9] Translated using Weblate (Spanish) 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/es/ Signed-off-by: Juan --- po/es.po | 65 +++++++++++++++++++------------------------------------- 1 file changed, 22 insertions(+), 43 deletions(-) diff --git a/po/es.po b/po/es.po index 882a64fe80..77c1daa2e6 100644 --- a/po/es.po +++ b/po/es.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.2.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2023-01-21 15:49+0000\n" -"PO-Revision-Date: 2022-11-27 12:48+0000\n" -"Last-Translator: Luis Méndez Alejo \n" +"PO-Revision-Date: 2023-02-08 11:35+0000\n" +"Last-Translator: Juan \n" "Language-Team: Spanish \n" "Language: es\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-dev\n" +"X-Generator: Weblate 4.16-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -3284,7 +3284,7 @@ msgstr "Tiempo máximo de ejecución" #: libraries/classes/Config/Descriptions.php:655 msgid "Use [code]LOCK TABLES[/code] statement" -msgstr "Utiliza la sentencia [code]LOCK TABLES[/code]" +msgstr "Utiliza la sentencia [code] LOCK TABLES [/code]" #: libraries/classes/Config/Descriptions.php:656 msgid "Save as file" @@ -7606,6 +7606,7 @@ msgid "" "WebAuthn is not available. Please use a supported browser in a secure " "context (HTTPS)." msgstr "" +"WebAuthn no está disponible. Utilice un navegador compatible con (HTTPS)." #: libraries/classes/Controllers/JavaScriptMessagesController.php:701 msgid "" @@ -10089,8 +10090,8 @@ msgstr "Ignorando código de idioma no compatible." msgid "" "Linting is disabled for this query because it exceeds the maximum length." msgstr "" -"El análisis de errores está deshabilitado para esta consulta porque supera " -"la longitud máxima." +"Linting está deshabilitado para esta consulta porque excede la longitud " +"máxima." #: libraries/classes/Linter.php:162 #, php-format @@ -12108,10 +12109,6 @@ msgid "Hardware Security Key (FIDO U2F)" msgstr "Clave de seguridad de hardware (FIDO U2F)" #: libraries/classes/Plugins/TwoFactor/Key.php:218 -#, fuzzy -#| msgid "" -#| "Provides authentication using hardware security tokens supporting FIDO " -#| "U2F, such as a Yubikey." msgid "" "Provides authentication using hardware security tokens supporting FIDO U2F, " "such as a YubiKey." @@ -12147,22 +12144,16 @@ msgid "For testing purposes only!" msgstr "¡Solo para fines de prueba!" #: libraries/classes/Plugins/TwoFactor/WebAuthn.php:180 -#, fuzzy -#| msgid "Hardware Security Key (FIDO U2F)" msgid "Hardware Security Key (WebAuthn/FIDO2)" -msgstr "Clave de seguridad de hardware (FIDO U2F)" +msgstr "Clave de seguridad de hardware (WebAuthn/FIDO2)" #: libraries/classes/Plugins/TwoFactor/WebAuthn.php:186 -#, fuzzy -#| msgid "" -#| "Provides authentication using hardware security tokens supporting FIDO " -#| "U2F, such as a Yubikey." msgid "" "Provides authentication using hardware security tokens supporting the " "WebAuthn/FIDO2 protocol, such as a YubiKey." msgstr "" "Proporciona autenticación mediante tokens de seguridad de hardware " -"compatibles con FIDO U2F, como Yubikey." +"compatibles con el protocolo WebAuthn/FIDO2, como YubiKey." #: libraries/classes/Query/Utilities.php:97 msgid "" @@ -13439,10 +13430,8 @@ msgstr "" "asumiendo el mapeo convencional de direcciones IPv4 en direcciones IPv6" #: libraries/classes/Types.php:445 -#, fuzzy -#| msgid "Stores a Universally Unique Identifier (UUID)" msgid "128-bit UUID (Universally Unique Identifier)" -msgstr "Almacena indentificadores únicos universales («UUID»)" +msgstr "128-bit UUID (Identificador único universal)" #: libraries/classes/Types.php:791 msgctxt "numeric types" @@ -16041,7 +16030,7 @@ msgstr "Advertencia" #: templates/home/index.twig:282 msgid "Notice" -msgstr "" +msgstr "Avisó" #: templates/home/index.twig:295 msgid "phpMyAdmin Themes" @@ -16500,10 +16489,8 @@ msgstr "" #: templates/login/twofactor/key_configure.twig:3 #: templates/login/twofactor/key.twig:3 #: templates/preferences/two_factor/main.twig:56 -#, fuzzy -#| msgid "Replicated" msgid "Deprecated!" -msgstr "Replicado/a" +msgstr "¡Obsoleto!" #: templates/login/twofactor/key_configure.twig:4 #: templates/login/twofactor/key.twig:4 @@ -16513,6 +16500,8 @@ msgid "" "The FIDO U2F API has been deprecated in favor of the Web Authentication API " "(WebAuthn)." msgstr "" +"La API FIDO U2F ha quedado obsoleta a favor de la API de autenticación web " +"(WebAuthn)." #: templates/login/twofactor/key_configure.twig:6 #: templates/login/twofactor/key.twig:6 @@ -16522,6 +16511,8 @@ msgid "" "API, however it's recommended that you use the WebAuthn authentication " "instead." msgstr "" +"Todavía puede usar Firefox para autenticar su cuenta usando la API FIDO U2F, " +"sin embargo, se recomienda que use la autenticación WebAuthn en su lugar." #: templates/login/twofactor/key_configure.twig:10 msgid "" @@ -16552,27 +16543,19 @@ msgid "Verify" msgstr "Verificar" #: templates/login/twofactor/webauthn_creation.twig:1 -#, fuzzy -#| msgid "" -#| "Please connect your FIDO U2F device into your computer's USB port. Then " -#| "confirm registration on the device." msgid "" "Please connect your WebAuthn/FIDO2 device. Then confirm registration on the " "device." msgstr "" -"Conecte el dispositivo FIDO U2F al puerto USB de su ordenador. A " -"continuación, confirme el registro en el dispositivo." +"Conecte su dispositivo WebAuthn/FIDO2. Luego confirme el registro en el " +"dispositivo." #: templates/login/twofactor/webauthn_request.twig:1 -#, fuzzy -#| msgid "" -#| "Please connect your FIDO U2F device into your computer's USB port. Then " -#| "confirm login on the device." msgid "" "Please connect your WebAuthn/FIDO2 device. Then confirm login on the device." msgstr "" -"Conecte el dispositivo FIDO U2F al puerto USB de su ordenador. A " -"continuación, confirme el inicio de sesión en el dispositivo." +"Conecte su dispositivo WebAuthn/FIDO2. Luego confirme el inicio de sesión en " +"el dispositivo." #: templates/menu/breadcrumbs.twig:27 msgid "View:" @@ -16813,15 +16796,11 @@ msgstr "" "esta cuenta." #: 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 "" -"El factor de doble autentificación no está disponible, por favor instale " -"dependencias opcionales para habilitar los backends de autentificación." +"Por favor instale dependencias opcionales para habilitar mas backends de " +"autentificación." #: templates/preferences/two_factor/main.twig:37 msgid "" From 84aee1b13b7db73d85d8f42390bcdcc3f6abcd95 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 8 Feb 2023 13:09:00 +0100 Subject: [PATCH 5/9] Add TEST_PATH for out of source tests Signed-off-by: William Desportes --- test/classes/Command/TwigLintCommandTest.php | 8 ++++---- test/classes/ThemeTest.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/classes/Command/TwigLintCommandTest.php b/test/classes/Command/TwigLintCommandTest.php index f56f9a089a..c87cac0b5e 100644 --- a/test/classes/Command/TwigLintCommandTest.php +++ b/test/classes/Command/TwigLintCommandTest.php @@ -44,7 +44,7 @@ class TwigLintCommandTest extends AbstractTestCase public function testGetTemplateContents(): void { $contents = $this->callFunction($this->command, TwigLintCommand::class, 'getTemplateContents', [ - ROOT_PATH . 'test/classes/_data/file_listing/subfolder/one.ini', + TEST_PATH . 'test/classes/_data/file_listing/subfolder/one.ini', ]); $this->assertSame('key=value' . "\n", $contents); @@ -52,7 +52,7 @@ class TwigLintCommandTest extends AbstractTestCase public function testFindFiles(): void { - $path = ROOT_PATH . 'test/classes/_data/file_listing'; + $path = TEST_PATH . 'test/classes/_data/file_listing'; $filesFound = $this->callFunction($this->command, TwigLintCommand::class, 'findFiles', [$path]); // Sort results to avoid file system test specific failures @@ -68,7 +68,7 @@ class TwigLintCommandTest extends AbstractTestCase public function testGetFilesInfo(): void { - $path = ROOT_PATH . 'test/classes/_data/file_listing'; + $path = TEST_PATH . 'test/classes/_data/file_listing'; $filesInfos = $this->callFunction($this->command, TwigLintCommand::class, 'getFilesInfo', [$path]); // Sort results to avoid file system test specific failures @@ -122,7 +122,7 @@ class TwigLintCommandTest extends AbstractTestCase ->willReturnOnConsecutiveCalls('{{ file }}', '{{ file }'); $filesFound = $this->callFunction($command, TwigLintCommand::class, 'getFilesInfo', [ - ROOT_PATH . 'test/classes/_data/file_listing', + TEST_PATH . 'test/classes/_data/file_listing', ]); $this->assertEquals([ diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index e21e3633e2..a088b61a0f 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -69,7 +69,7 @@ class ThemeTest extends AbstractTestCase */ public function testCheckImgPathIncorrect(): void { - $this->object->setPath(ROOT_PATH . 'test/classes/_data/incorrect_theme'); + $this->object->setPath(TEST_PATH . 'test/classes/_data/incorrect_theme'); $this->assertFalse( $this->object->loadInfo(), 'Theme name is not properly set' From e48fec0abfd7121732bc8848fda15f9b54d7ae23 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 8 Feb 2023 13:15:33 +0100 Subject: [PATCH 6/9] Add ChangeLog entries for #17028, #17683, #17766 Signed-off-by: William Desportes --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1a94cf618e..d128903499 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ phpMyAdmin - ChangeLog ====================== +5.2.2 (not yet released) +- issue #17028 Fix total count of rows in not accurate +- issue #17683 Fix total count of rows in not accurate +- issue #17766 Allow to open in a new tab copy and edit row actions + 5.2.1 (2023-02-07) - issue #17522 Fix case where the routes cache file is invalid - issue #17506 Fix error when configuring 2FA without XMLWriter or Imagick From ae560e0ffb898e0f31009276cbe5ae9755e41f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 8 Feb 2023 11:28:34 -0300 Subject: [PATCH 7/9] Prepare for version 5.2.2-dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- README | 2 +- doc/conf.py | 2 +- libraries/classes/Version.php | 10 +++++----- package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README b/README index 9970bea320..d21df5273f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 5.2.1 +Version 5.2.2-dev A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 6e690eff6f..b7f2e21528 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2021, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '5.2.1' +version = '5.2.2-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/classes/Version.php b/libraries/classes/Version.php index d7ba58117e..3902a0eb8e 100644 --- a/libraries/classes/Version.php +++ b/libraries/classes/Version.php @@ -14,12 +14,12 @@ use const VERSION_SUFFIX; final class Version { // The VERSION_SUFFIX constant is defined at libraries/constants.php - public const VERSION = '5.2.1' . VERSION_SUFFIX; + public const VERSION = '5.2.2-dev' . VERSION_SUFFIX; public const SERIES = '5.2'; public const MAJOR = 5; public const MINOR = 2; - public const PATCH = 1; - public const ID = 50201; - public const PRE_RELEASE_NAME = ''; - public const IS_DEV = false; + public const PATCH = 2; + public const ID = 50202; + public const PRE_RELEASE_NAME = 'dev'; + public const IS_DEV = true; } diff --git a/package.json b/package.json index 584a45243f..1709caf4f4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phpmyadmin", - "version": "5.2.1", + "version": "5.2.2-dev", "description": "A web interface for MySQL and MariaDB", "repository": "https://github.com/phpmyadmin/phpmyadmin.git", "author": "The phpMyAdmin Team (https://www.phpmyadmin.net/team/)", From 0f014beac26a5ed7fed8780e0d8c140db937f4d8 Mon Sep 17 00:00:00 2001 From: phpMyAdmin bot Date: Wed, 8 Feb 2023 15:09:23 +0000 Subject: [PATCH 8/9] Update po files [ci skip] Signed-off-by: phpMyAdmin bot --- po/af.po | 101 +++++++++++++++++---------------- po/am.po | 101 +++++++++++++++++---------------- po/ar.po | 101 +++++++++++++++++---------------- po/ar_LY.po | 101 +++++++++++++++++---------------- po/az.po | 101 +++++++++++++++++---------------- po/be.po | 101 +++++++++++++++++---------------- po/be@latin.po | 101 +++++++++++++++++---------------- po/ber.po | 101 +++++++++++++++++---------------- po/bg.po | 101 +++++++++++++++++---------------- po/bn.po | 101 +++++++++++++++++---------------- po/br.po | 101 +++++++++++++++++---------------- po/brx.po | 101 +++++++++++++++++---------------- po/bs.po | 101 +++++++++++++++++---------------- po/ca.po | 101 +++++++++++++++++---------------- po/ckb.po | 101 +++++++++++++++++---------------- po/cs.po | 105 +++++++++++++++++----------------- po/cy.po | 101 +++++++++++++++++---------------- po/da.po | 101 +++++++++++++++++---------------- po/de.po | 99 ++++++++++++++++---------------- po/el.po | 101 +++++++++++++++++---------------- po/en_GB.po | 101 +++++++++++++++++---------------- po/enm.po | 101 +++++++++++++++++---------------- po/eo.po | 101 +++++++++++++++++---------------- po/es.po | 101 +++++++++++++++++---------------- po/et.po | 101 +++++++++++++++++---------------- po/eu.po | 101 +++++++++++++++++---------------- po/fa.po | 101 +++++++++++++++++---------------- po/fi.po | 101 +++++++++++++++++---------------- po/fil.po | 101 +++++++++++++++++---------------- po/fr.po | 99 ++++++++++++++++---------------- po/fy.po | 101 +++++++++++++++++---------------- po/gl.po | 101 +++++++++++++++++---------------- po/gu.po | 101 +++++++++++++++++---------------- po/he.po | 101 +++++++++++++++++---------------- po/hi.po | 101 +++++++++++++++++---------------- po/hr.po | 101 +++++++++++++++++---------------- po/hu.po | 101 +++++++++++++++++---------------- po/hy.po | 101 +++++++++++++++++---------------- po/ia.po | 101 +++++++++++++++++---------------- po/id.po | 101 +++++++++++++++++---------------- po/ig.po | 101 +++++++++++++++++---------------- po/it.po | 101 +++++++++++++++++---------------- po/ja.po | 141 ++++++++++++++++++++++++---------------------- po/ka.po | 101 +++++++++++++++++---------------- po/kab.po | 101 +++++++++++++++++---------------- po/kk.po | 101 +++++++++++++++++---------------- po/km.po | 101 +++++++++++++++++---------------- po/kn.po | 101 +++++++++++++++++---------------- po/ko.po | 101 +++++++++++++++++---------------- po/ksh.po | 101 +++++++++++++++++---------------- po/ku.po | 101 +++++++++++++++++---------------- po/ky.po | 101 +++++++++++++++++---------------- po/li.po | 101 +++++++++++++++++---------------- po/lt.po | 101 +++++++++++++++++---------------- po/lv.po | 101 +++++++++++++++++---------------- po/mk.po | 105 +++++++++++++++++----------------- po/ml.po | 101 +++++++++++++++++---------------- po/mn.po | 101 +++++++++++++++++---------------- po/ms.po | 101 +++++++++++++++++---------------- po/my.po | 101 +++++++++++++++++---------------- po/nb.po | 101 +++++++++++++++++---------------- po/ne.po | 101 +++++++++++++++++---------------- po/nl.po | 105 +++++++++++++++++----------------- po/nn.po | 101 +++++++++++++++++---------------- po/pa.po | 101 +++++++++++++++++---------------- po/phpmyadmin.pot | 101 +++++++++++++++++---------------- po/pl.po | 101 +++++++++++++++++---------------- po/pt.po | 101 +++++++++++++++++---------------- po/pt_BR.po | 101 +++++++++++++++++---------------- po/rcf.po | 101 +++++++++++++++++---------------- po/ro.po | 111 ++++++++++++++++++------------------ po/ru.po | 101 +++++++++++++++++---------------- po/si.po | 101 +++++++++++++++++---------------- po/sk.po | 101 +++++++++++++++++---------------- po/sl.po | 101 +++++++++++++++++---------------- po/sq.po | 101 +++++++++++++++++---------------- po/sr.po | 101 +++++++++++++++++---------------- po/sr@latin.po | 101 +++++++++++++++++---------------- po/sv.po | 101 +++++++++++++++++---------------- po/ta.po | 101 +++++++++++++++++---------------- po/te.po | 101 +++++++++++++++++---------------- po/th.po | 101 +++++++++++++++++---------------- po/tk.po | 101 +++++++++++++++++---------------- po/tr.po | 101 +++++++++++++++++---------------- po/tt.po | 101 +++++++++++++++++---------------- po/tzm.po | 101 +++++++++++++++++---------------- po/ug.po | 101 +++++++++++++++++---------------- po/uk.po | 101 +++++++++++++++++---------------- po/ur.po | 101 +++++++++++++++++---------------- po/uz.po | 101 +++++++++++++++++---------------- po/uz@latin.po | 101 +++++++++++++++++---------------- po/vi.po | 101 +++++++++++++++++---------------- po/vls.po | 101 +++++++++++++++++---------------- po/zh_CN.po | 101 +++++++++++++++++---------------- po/zh_TW.po | 101 +++++++++++++++++---------------- 95 files changed, 4877 insertions(+), 4776 deletions(-) diff --git a/po/af.po b/po/af.po index ab223a897a..e2b0646696 100644 --- a/po/af.po +++ b/po/af.po @@ -1,9 +1,9 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:34+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Afrikaans \n" "Language-Team: Amharic \n" "Language-Team: Arabic \n" "Language-Team: Arabic (Libya) \n" "Language-Team: Azerbaijani \n" "Language-Team: Belarusian \n" "Language-Team: Belarusian (latin) \n" "Language-Team: Berber \n" "Language-Team: Bulgarian \n" "Language-Team: Bengali \n" "Language-Team: Breton %s:" msgid "web server upload directory:" msgstr "Diuzit e-mesk kavlec'h pellgargañ ar servijer web %s :" -#: libraries/classes/InsertEdit.php:1332 libraries/classes/Sql.php:964 +#: libraries/classes/InsertEdit.php:1341 libraries/classes/Sql.php:965 msgid "Showing SQL query" msgstr "" -#: libraries/classes/InsertEdit.php:1356 libraries/classes/Sql.php:944 +#: libraries/classes/InsertEdit.php:1365 libraries/classes/Sql.php:945 #, php-format msgid "Inserted row id: %1$d" msgstr "" @@ -11103,7 +11103,7 @@ msgstr "" #: libraries/classes/Plugins/Export/ExportTexytext.php:464 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:365 #: templates/database/events/editor_form.twig:82 -#: templates/database/routines/editor_form.twig:109 +#: templates/database/routines/editor_form.twig:113 #: templates/database/triggers/editor_form.twig:57 msgid "Definition" msgstr "" @@ -12753,23 +12753,23 @@ msgstr "" msgid "No newer stable version is available" msgstr "" -#: libraries/classes/Sql.php:497 +#: libraries/classes/Sql.php:498 #, php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "" -#: libraries/classes/Sql.php:961 +#: libraries/classes/Sql.php:962 msgid "Showing as PHP code" msgstr "" -#: libraries/classes/Sql.php:1336 +#: libraries/classes/Sql.php:1337 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " "Edit, Copy and Delete features are not available. %s" msgstr "" -#: libraries/classes/Sql.php:1350 +#: libraries/classes/Sql.php:1351 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, Edit, Copy " @@ -13894,7 +13894,7 @@ msgstr "" #: templates/config/form_display/input.twig:53 #: templates/database/data_dictionary/index.twig:81 #: templates/database/events/editor_form.twig:102 -#: templates/database/routines/editor_form.twig:163 +#: templates/database/routines/editor_form.twig:167 #: templates/database/structure/table_header.twig:46 templates/indexes.twig:24 #: templates/table/structure/display_partitions.twig:31 #: templates/table/structure/display_structure.twig:483 @@ -13983,7 +13983,7 @@ msgstr "Etrerummadiñ" #: templates/columns_definitions/table_fields_definitions.twig:36 #: templates/database/operations/index.twig:68 #: templates/database/operations/index.twig:173 -#: templates/database/routines/editor_form.twig:124 +#: templates/database/routines/editor_form.twig:128 #: templates/database/structure/copy_form.twig:50 #: templates/table/operations/index.twig:79 #: templates/table/operations/index.twig:115 @@ -14716,7 +14716,7 @@ msgid "On completion preserve" msgstr "Ensoc'hadennoù sevenet" #: templates/database/events/editor_form.twig:96 -#: templates/database/routines/editor_form.twig:138 +#: templates/database/routines/editor_form.twig:142 #: templates/database/triggers/editor_form.twig:61 #: templates/view_create.twig:45 msgid "Definer" @@ -15168,47 +15168,48 @@ msgstr "" msgid "Direction" msgstr "" -#: templates/database/routines/editor_form.twig:66 +#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:69 msgid "Add parameter" msgstr "" -#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:70 msgid "Remove last parameter" msgstr "" -#: templates/database/routines/editor_form.twig:71 +#: templates/database/routines/editor_form.twig:75 msgid "Return type" msgstr "" -#: templates/database/routines/editor_form.twig:79 +#: templates/database/routines/editor_form.twig:83 msgid "Return length/values" msgstr "" -#: templates/database/routines/editor_form.twig:86 +#: templates/database/routines/editor_form.twig:90 msgid "Return options" msgstr "" -#: templates/database/routines/editor_form.twig:90 +#: templates/database/routines/editor_form.twig:94 #: templates/database/routines/parameter_row.twig:31 #: templates/database/structure/table_header.twig:42 msgid "Charset" msgstr "" -#: templates/database/routines/editor_form.twig:115 +#: templates/database/routines/editor_form.twig:119 msgid "Is deterministic" msgstr "" -#: templates/database/routines/editor_form.twig:131 +#: templates/database/routines/editor_form.twig:135 msgid "" "You do not have sufficient privileges to perform this operation; Please " "refer to the documentation for more details." msgstr "" -#: templates/database/routines/editor_form.twig:144 +#: templates/database/routines/editor_form.twig:148 msgid "Security type" msgstr "" -#: templates/database/routines/editor_form.twig:153 +#: templates/database/routines/editor_form.twig:157 msgid "SQL data access" msgstr "" diff --git a/po/brx.po b/po/brx.po index ecdf6d6ad2..ceab00436f 100644 --- a/po/brx.po +++ b/po/brx.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2015-09-04 09:33+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: Bodo \n" "Language-Team: Bosnian , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-03-12 11:57+0000\n" "Last-Translator: roger <616steam@gmail.com>\n" "Language-Team: Catalan \n" "Language-Team: Kurdish (Central) \n" -"Language-Team: Czech " -"\n" +"Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1338,7 +1338,7 @@ msgstr "Vyhledat:" #: templates/database/operations/index.twig:75 #: templates/database/operations/index.twig:185 #: templates/database/operations/index.twig:225 -#: templates/database/routines/editor_form.twig:176 +#: templates/database/routines/editor_form.twig:180 #: templates/database/routines/execute_form.twig:55 #: templates/database/search/main.twig:74 #: templates/database/triggers/editor_form.twig:69 @@ -4242,7 +4242,7 @@ msgstr "Přeskočit zamčené tabulky" #: libraries/classes/Config/Descriptions.php:946 #: libraries/classes/ConfigStorage/UserGroups.php:124 #: libraries/classes/Controllers/JavaScriptMessagesController.php:388 -#: libraries/classes/Display/Results.php:2967 +#: libraries/classes/Display/Results.php:2969 #: libraries/classes/Html/Generator.php:657 #: libraries/classes/Html/Generator.php:908 #: templates/console/bookmark_content.twig:7 templates/console/display.twig:31 @@ -5088,7 +5088,7 @@ msgid "Table %s has been emptied." msgstr "Tabulka %s byla vyprázdněna." #: libraries/classes/Controllers/Database/StructureController.php:577 -#: libraries/classes/Display/Results.php:3980 +#: libraries/classes/Display/Results.php:3982 #, php-format msgid "" "This view has at least this number of rows. Please refer to " @@ -6589,7 +6589,7 @@ msgid "Show query box" msgstr "Zobrazit pole pro dotaz" #: libraries/classes/Controllers/JavaScriptMessagesController.php:389 -#: libraries/classes/Display/Results.php:3035 +#: libraries/classes/Display/Results.php:3037 #: libraries/classes/Tracking.php:260 templates/console/bookmark_content.twig:7 #: templates/database/central_columns/main.twig:268 #: templates/database/central_columns/main.twig:380 @@ -6852,13 +6852,13 @@ msgstr "Obsah datového bodu" #: libraries/classes/Controllers/JavaScriptMessagesController.php:475 #: libraries/classes/Controllers/JavaScriptMessagesController.php:631 -#: libraries/classes/ErrorHandler.php:446 libraries/classes/InsertEdit.php:1996 +#: libraries/classes/ErrorHandler.php:446 libraries/classes/InsertEdit.php:2005 #: templates/table/index_form.twig:167 templates/table/index_form.twig:203 msgid "Ignore" msgstr "Ignorovat" #: libraries/classes/Controllers/JavaScriptMessagesController.php:476 -#: libraries/classes/Display/Results.php:2971 +#: libraries/classes/Display/Results.php:2973 #: libraries/classes/Html/Generator.php:75 #: templates/display/results/table.twig:231 #: templates/display/results/table.twig:232 @@ -7446,13 +7446,13 @@ msgid "Table %s already exists!" msgstr "Tabulka %s již existuje!" #: libraries/classes/Controllers/JavaScriptMessagesController.php:708 -#: libraries/classes/InsertEdit.php:326 +#: libraries/classes/InsertEdit.php:335 #: libraries/classes/Navigation/Nodes/NodeDatabaseChild.php:53 msgid "Hide" msgstr "Skrýt" #: libraries/classes/Controllers/JavaScriptMessagesController.php:709 -#: libraries/classes/Controllers/Table/ChangeController.php:187 +#: libraries/classes/Controllers/Table/ChangeController.php:194 #: templates/database/multi_table_query/form.twig:49 #: templates/database/tracking/tables.twig:19 #: templates/table/tracking/main.twig:33 @@ -8310,7 +8310,7 @@ msgid "Insecure connection" msgstr "Nezabezpečené připojení" #: libraries/classes/Controllers/Sql/SqlController.php:235 -#: libraries/classes/Sql.php:1153 +#: libraries/classes/Sql.php:1154 #, php-format msgid "Bookmark %s has been created." msgstr "Byl vytvořen oblíbený dotaz %s." @@ -8375,7 +8375,7 @@ msgstr "Tabulka %s již existuje!" #: libraries/classes/Controllers/Table/RelationController.php:241 #: libraries/classes/Controllers/View/OperationsController.php:87 #: libraries/classes/Database/Routines.php:1224 -#: libraries/classes/Display/Results.php:3693 libraries/classes/Message.php:172 +#: libraries/classes/Display/Results.php:3695 libraries/classes/Message.php:172 #: templates/sql/query.twig:7 msgid "Your SQL query has been executed successfully." msgstr "Váš SQL-dotaz byl úspěšně vykonán." @@ -8414,8 +8414,8 @@ msgstr "Na vašem požadavku došlo k problému." #: libraries/classes/Controllers/Table/GetFieldController.php:86 #: libraries/classes/Database/Routines.php:1243 -#: libraries/classes/Import.php:149 libraries/classes/InsertEdit.php:220 -#: libraries/classes/Sql.php:967 +#: libraries/classes/Import.php:149 libraries/classes/InsertEdit.php:229 +#: libraries/classes/Sql.php:968 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)." @@ -8442,7 +8442,7 @@ msgstr "Pohled" #: libraries/classes/Controllers/Table/Partition/TruncateController.php:62 #: libraries/classes/Controllers/View/OperationsController.php:90 #: libraries/classes/Html/Generator.php:856 libraries/classes/Import.php:133 -#: libraries/classes/InsertEdit.php:715 libraries/classes/Message.php:192 +#: libraries/classes/InsertEdit.php:724 libraries/classes/Message.php:192 #: templates/error/generic.twig:37 #: templates/table/structure/display_structure.twig:372 msgid "Error" @@ -9094,41 +9094,41 @@ msgstr "Sestupně" msgid "Ascending" msgstr "Vzestupně" -#: libraries/classes/Display/Results.php:3011 -#: libraries/classes/Display/Results.php:3026 +#: libraries/classes/Display/Results.php:3013 +#: libraries/classes/Display/Results.php:3028 msgid "The row has been deleted." msgstr "Řádek byl smazán." -#: libraries/classes/Display/Results.php:3058 +#: libraries/classes/Display/Results.php:3060 #: templates/server/status/processes/list.twig:44 msgid "Kill" msgstr "Ukončit" -#: libraries/classes/Display/Results.php:3626 +#: libraries/classes/Display/Results.php:3628 msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]." msgstr "Počet nemusí být přesný, viz [doc@faq3-11]FAQ 3.11[/doc]." -#: libraries/classes/Display/Results.php:3989 +#: libraries/classes/Display/Results.php:3991 #, php-format msgid "Showing rows %1s - %2s" msgstr "Zobrazeny záznamy %1s - %2s" -#: libraries/classes/Display/Results.php:4003 +#: libraries/classes/Display/Results.php:4005 #, php-format msgid "%1$d total, %2$d in query" msgstr "%1$d celkem, %2$d v dotazu" -#: libraries/classes/Display/Results.php:4008 +#: libraries/classes/Display/Results.php:4010 #, php-format msgid "%d total" msgstr "%d celkem" -#: libraries/classes/Display/Results.php:4021 libraries/classes/Sql.php:973 +#: libraries/classes/Display/Results.php:4023 libraries/classes/Sql.php:974 #, php-format msgid "Query took %01.4f seconds." msgstr "Dotaz trval %01.4f sekund." -#: libraries/classes/Display/Results.php:4352 +#: libraries/classes/Display/Results.php:4354 msgid "Link not found!" msgstr "Odkaz nebyl nalezen!" @@ -9659,7 +9659,7 @@ msgstr "Statická analýza:" msgid "%d errors were found during analysis." msgstr "Při analýze bylo nalezeno %d chyb." -#: libraries/classes/Import.php:287 libraries/classes/Sql.php:981 +#: libraries/classes/Import.php:287 libraries/classes/Sql.php:982 msgid "[ROLLBACK occurred.]" msgstr "[ROLLBACK nastal]" @@ -9753,7 +9753,7 @@ msgstr "" "Indexy %1$s a %2$s vypadají shodně a jeden z nich by zřejmě bylo možné " "odstranit." -#: libraries/classes/InsertEdit.php:342 +#: libraries/classes/InsertEdit.php:351 #: libraries/classes/Navigation/Nodes/NodeFunction.php:28 #: templates/database/routines/execute_form.twig:18 #: templates/table/search/index.twig:36 @@ -9761,7 +9761,7 @@ msgstr "" msgid "Function" msgstr "Funkce" -#: libraries/classes/InsertEdit.php:345 +#: libraries/classes/InsertEdit.php:354 #: libraries/classes/Plugins/Export/ExportHtmlword.php:275 #: libraries/classes/Plugins/Export/ExportHtmlword.php:370 #: libraries/classes/Plugins/Export/ExportLatex.php:543 @@ -9795,12 +9795,12 @@ msgstr "Funkce" msgid "Type" msgstr "Typ" -#: libraries/classes/InsertEdit.php:716 templates/import.twig:60 +#: libraries/classes/InsertEdit.php:725 templates/import.twig:60 #: templates/import.twig:85 msgid "The directory you set for upload work cannot be reached." msgstr "Adresář určený pro upload souborů nemohl být otevřen." -#: libraries/classes/InsertEdit.php:724 +#: libraries/classes/InsertEdit.php:733 #: templates/database/qbe/ins_del_and_or_cell.twig:24 #: templates/server/privileges/privileges_table.twig:32 #: templates/server/privileges/privileges_table.twig:59 @@ -9810,15 +9810,15 @@ msgstr "Adresář určený pro upload souborů nemohl být otevřen." msgid "Or" msgstr "Nebo" -#: libraries/classes/InsertEdit.php:725 +#: libraries/classes/InsertEdit.php:734 msgid "web server upload directory:" msgstr "soubor z adresáře pro upload:" -#: libraries/classes/InsertEdit.php:1332 libraries/classes/Sql.php:964 +#: libraries/classes/InsertEdit.php:1341 libraries/classes/Sql.php:965 msgid "Showing SQL query" msgstr "Zobrazuji SQL dotaz" -#: libraries/classes/InsertEdit.php:1356 libraries/classes/Sql.php:944 +#: libraries/classes/InsertEdit.php:1365 libraries/classes/Sql.php:945 #, php-format msgid "Inserted row id: %1$d" msgstr "ID vloženého řádku: %1$d" @@ -10873,7 +10873,7 @@ msgstr "Název" #: libraries/classes/Plugins/Export/ExportTexytext.php:464 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:365 #: templates/database/events/editor_form.twig:82 -#: templates/database/routines/editor_form.twig:109 +#: templates/database/routines/editor_form.twig:113 #: templates/database/triggers/editor_form.twig:57 msgid "Definition" msgstr "Definice" @@ -12525,16 +12525,16 @@ msgstr "" msgid "No newer stable version is available" msgstr "Není dostupná žádná novější verze" -#: libraries/classes/Sql.php:497 +#: libraries/classes/Sql.php:498 #, php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "Pro procházení databáze je použit oblíbený dotaz „%s\"." -#: libraries/classes/Sql.php:961 +#: libraries/classes/Sql.php:962 msgid "Showing as PHP code" msgstr "Zobrazuji jako PHP kód" -#: libraries/classes/Sql.php:1336 +#: libraries/classes/Sql.php:1337 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " @@ -12543,7 +12543,7 @@ msgstr "" "Aktuální výběr neobsahuje unikátní klíč. Editování v mřížce, zaškrtávací " "políčka nebo odkazy na editaci a mazání proto nejsou k dispozici. %s" -#: libraries/classes/Sql.php:1350 +#: libraries/classes/Sql.php:1351 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, Edit, Copy " @@ -13647,7 +13647,7 @@ msgstr "Úložiště" #: templates/config/form_display/input.twig:53 #: templates/database/data_dictionary/index.twig:81 #: templates/database/events/editor_form.twig:102 -#: templates/database/routines/editor_form.twig:163 +#: templates/database/routines/editor_form.twig:167 #: templates/database/structure/table_header.twig:46 templates/indexes.twig:24 #: templates/table/structure/display_partitions.twig:31 #: templates/table/structure/display_structure.twig:483 @@ -13732,7 +13732,7 @@ msgstr "Porovnávání" #: templates/columns_definitions/table_fields_definitions.twig:36 #: templates/database/operations/index.twig:68 #: templates/database/operations/index.twig:173 -#: templates/database/routines/editor_form.twig:124 +#: templates/database/routines/editor_form.twig:128 #: templates/database/structure/copy_form.twig:50 #: templates/table/operations/index.twig:79 #: templates/table/operations/index.twig:115 @@ -14348,7 +14348,7 @@ msgid "On completion preserve" msgstr "Při dokončení zachovat" #: templates/database/events/editor_form.twig:96 -#: templates/database/routines/editor_form.twig:138 +#: templates/database/routines/editor_form.twig:142 #: templates/database/triggers/editor_form.twig:61 #: templates/view_create.twig:45 msgid "Definer" @@ -14734,37 +14734,38 @@ msgstr "Parametry" msgid "Direction" msgstr "Směr" -#: templates/database/routines/editor_form.twig:66 +#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:69 msgid "Add parameter" msgstr "Přidat parametr" -#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:70 msgid "Remove last parameter" msgstr "Odstranit poslední parametr" -#: templates/database/routines/editor_form.twig:71 +#: templates/database/routines/editor_form.twig:75 msgid "Return type" msgstr "Návratový typ" -#: templates/database/routines/editor_form.twig:79 +#: templates/database/routines/editor_form.twig:83 msgid "Return length/values" msgstr "Návratová délka/hodnoty" -#: templates/database/routines/editor_form.twig:86 +#: templates/database/routines/editor_form.twig:90 msgid "Return options" msgstr "Možnosti návratové hodnoty" -#: templates/database/routines/editor_form.twig:90 +#: templates/database/routines/editor_form.twig:94 #: templates/database/routines/parameter_row.twig:31 #: templates/database/structure/table_header.twig:42 msgid "Charset" msgstr "Znaková sada" -#: templates/database/routines/editor_form.twig:115 +#: templates/database/routines/editor_form.twig:119 msgid "Is deterministic" msgstr "Je deterministická" -#: templates/database/routines/editor_form.twig:131 +#: templates/database/routines/editor_form.twig:135 msgid "" "You do not have sufficient privileges to perform this operation; Please " "refer to the documentation for more details." @@ -14772,11 +14773,11 @@ msgstr "" "Nemáte dostatečná oprávnění k provedení této operace, další informace " "najdete v dokumentaci." -#: templates/database/routines/editor_form.twig:144 +#: templates/database/routines/editor_form.twig:148 msgid "Security type" msgstr "Typ zabezpečení" -#: templates/database/routines/editor_form.twig:153 +#: templates/database/routines/editor_form.twig:157 msgid "SQL data access" msgstr "Přístup k SQL datům" diff --git a/po/cy.po b/po/cy.po index de43db3437..89927ba67c 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4,9 +4,9 @@ # FIRST AUTHOR , YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:34+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Welsh \n" "Language-Team: Danish \n" "Language-Team: German , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:34+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Greek \n" "Language-Team: English (United Kingdom) \n" "Language-Team: English (Middle) \n" "Language-Team: Esperanto , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2023-02-08 11:35+0000\n" "Last-Translator: Juan \n" "Language-Team: Spanish \n" "Language-Team: Estonian \n" "Language-Team: Basque \n" "Language-Team: Persian %s:" msgid "web server upload directory:" msgstr "انتخاب از مسیر آپلود در سرور %s:" -#: libraries/classes/InsertEdit.php:1332 libraries/classes/Sql.php:964 +#: libraries/classes/InsertEdit.php:1341 libraries/classes/Sql.php:965 msgid "Showing SQL query" msgstr "نمایش پرس و جو SQL" -#: libraries/classes/InsertEdit.php:1356 libraries/classes/Sql.php:944 +#: libraries/classes/InsertEdit.php:1365 libraries/classes/Sql.php:945 #, php-format msgid "Inserted row id: %1$d" msgstr "درج شناسه ردیف: %1$d" @@ -10947,7 +10947,7 @@ msgstr "اسم" #: libraries/classes/Plugins/Export/ExportTexytext.php:464 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:365 #: templates/database/events/editor_form.twig:82 -#: templates/database/routines/editor_form.twig:109 +#: templates/database/routines/editor_form.twig:113 #: templates/database/triggers/editor_form.twig:57 #, fuzzy #| msgid "Description" @@ -12609,16 +12609,16 @@ msgstr "" msgid "No newer stable version is available" msgstr "" -#: libraries/classes/Sql.php:497 +#: libraries/classes/Sql.php:498 #, php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "" -#: libraries/classes/Sql.php:961 +#: libraries/classes/Sql.php:962 msgid "Showing as PHP code" msgstr "" -#: libraries/classes/Sql.php:1336 +#: libraries/classes/Sql.php:1337 #, fuzzy, php-format #| msgid "" #| "This table does not contain a unique column. Features related to the grid " @@ -12630,7 +12630,7 @@ msgstr "" "این جدول هیچ مقدار کلیدی ندارد. امکانات ویرایش جدولی، چک باکس ها ، ویرایش ، " "کپی و حذف ممکن است کار نکنند." -#: libraries/classes/Sql.php:1350 +#: libraries/classes/Sql.php:1351 #, fuzzy, php-format #| msgid "" #| "This table does not contain a unique column. Features related to the grid " @@ -13775,7 +13775,7 @@ msgstr "موتور" #: templates/config/form_display/input.twig:53 #: templates/database/data_dictionary/index.twig:81 #: templates/database/events/editor_form.twig:102 -#: templates/database/routines/editor_form.twig:163 +#: templates/database/routines/editor_form.twig:167 #: templates/database/structure/table_header.twig:46 templates/indexes.twig:24 #: templates/table/structure/display_partitions.twig:31 #: templates/table/structure/display_structure.twig:483 @@ -13877,7 +13877,7 @@ msgstr "مقایسه" #: templates/columns_definitions/table_fields_definitions.twig:36 #: templates/database/operations/index.twig:68 #: templates/database/operations/index.twig:173 -#: templates/database/routines/editor_form.twig:124 +#: templates/database/routines/editor_form.twig:128 #: templates/database/structure/copy_form.twig:50 #: templates/table/operations/index.twig:79 #: templates/table/operations/index.twig:115 @@ -14615,7 +14615,7 @@ msgid "On completion preserve" msgstr "تمام وروديها" #: templates/database/events/editor_form.twig:96 -#: templates/database/routines/editor_form.twig:138 +#: templates/database/routines/editor_form.twig:142 #: templates/database/triggers/editor_form.twig:61 #: templates/view_create.twig:45 msgid "Definer" @@ -15072,50 +15072,51 @@ msgstr "پارامترها" msgid "Direction" msgstr "ایجاد" -#: templates/database/routines/editor_form.twig:66 +#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:69 msgid "Add parameter" msgstr "ایجاد پارامتر" -#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:70 msgid "Remove last parameter" msgstr "حذف آخرین پارامتر" -#: templates/database/routines/editor_form.twig:71 +#: templates/database/routines/editor_form.twig:75 msgid "Return type" msgstr "نوع برگشتی" -#: templates/database/routines/editor_form.twig:79 +#: templates/database/routines/editor_form.twig:83 #, fuzzy #| msgid "Length/Values" msgid "Return length/values" msgstr "طول/مقادير*" -#: templates/database/routines/editor_form.twig:86 +#: templates/database/routines/editor_form.twig:90 #, fuzzy msgid "Return options" msgstr "آمار پايگاههاي داده" -#: templates/database/routines/editor_form.twig:90 +#: templates/database/routines/editor_form.twig:94 #: templates/database/routines/parameter_row.twig:31 #: templates/database/structure/table_header.twig:42 msgid "Charset" msgstr "" -#: templates/database/routines/editor_form.twig:115 +#: templates/database/routines/editor_form.twig:119 msgid "Is deterministic" msgstr "" -#: templates/database/routines/editor_form.twig:131 +#: templates/database/routines/editor_form.twig:135 msgid "" "You do not have sufficient privileges to perform this operation; Please " "refer to the documentation for more details." msgstr "" -#: templates/database/routines/editor_form.twig:144 +#: templates/database/routines/editor_form.twig:148 msgid "Security type" msgstr "حالت امنیتی" -#: templates/database/routines/editor_form.twig:153 +#: templates/database/routines/editor_form.twig:157 msgid "SQL data access" msgstr "" diff --git a/po/fi.po b/po/fi.po index 9eac907774..d12abc10b0 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,9 +1,9 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:34+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Finnish \n" "Language-Team: Filipino \n" "Language-Team: French \n" "Language-Team: Frisian , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:34+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Galician \n" "Language-Team: Gujarati \n" "Language-Team: Hebrew \n" "Language-Team: Hindi \n" "Language-Team: Croatian , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Péter Báthory \n" "Language-Team: Hungarian \n" "Language-Team: Armenian \n" "Language-Team: Interlingua \n" "Language-Team: Indonesian \n" "Language-Team: Igbo , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2023-02-02 11:39+0000\n" "Last-Translator: JL Pilgram \n" "Language-Team: Italian \n" "Language-Team: Japanese , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-04-02 14:06+0000\n" "Last-Translator: Malkhazi Dartsmelidze \n" "Language-Team: Georgian \n" "Language-Team: Kabyle \n" "Language-Team: Kazakh \n" "Language-Team: Central Khmer \n" "Language-Team: Kannada \n" "Language-Team: Korean \n" "Language-Team: Colognian \n" "Language-Team: Kurdish \n" "Language-Team: Kyrgyz \n" "Language-Team: Limburgish , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \n" -"Language-Team: Macedonian \n" +"Language-Team: Macedonian \n" "Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1185,7 +1185,7 @@ msgstr "Пребарај:" #: templates/database/operations/index.twig:75 #: templates/database/operations/index.twig:185 #: templates/database/operations/index.twig:225 -#: templates/database/routines/editor_form.twig:176 +#: templates/database/routines/editor_form.twig:180 #: templates/database/routines/execute_form.twig:55 #: templates/database/search/main.twig:74 #: templates/database/triggers/editor_form.twig:69 @@ -4040,7 +4040,7 @@ msgstr "" #: libraries/classes/Config/Descriptions.php:946 #: libraries/classes/ConfigStorage/UserGroups.php:124 #: libraries/classes/Controllers/JavaScriptMessagesController.php:388 -#: libraries/classes/Display/Results.php:2967 +#: libraries/classes/Display/Results.php:2969 #: libraries/classes/Html/Generator.php:657 #: libraries/classes/Html/Generator.php:908 #: templates/console/bookmark_content.twig:7 templates/console/display.twig:31 @@ -4848,7 +4848,7 @@ msgid "Table %s has been emptied." msgstr "Табелата %s е испразнета." #: libraries/classes/Controllers/Database/StructureController.php:577 -#: libraries/classes/Display/Results.php:3980 +#: libraries/classes/Display/Results.php:3982 #, php-format msgid "" "This view has at least this number of rows. Please refer to " @@ -6322,7 +6322,7 @@ msgid "Show query box" msgstr "SQL упит" #: libraries/classes/Controllers/JavaScriptMessagesController.php:389 -#: libraries/classes/Display/Results.php:3035 +#: libraries/classes/Display/Results.php:3037 #: libraries/classes/Tracking.php:260 templates/console/bookmark_content.twig:7 #: templates/database/central_columns/main.twig:268 #: templates/database/central_columns/main.twig:380 @@ -6585,13 +6585,13 @@ msgstr "Големина на покажувачите на податоци" #: libraries/classes/Controllers/JavaScriptMessagesController.php:475 #: libraries/classes/Controllers/JavaScriptMessagesController.php:631 -#: libraries/classes/ErrorHandler.php:446 libraries/classes/InsertEdit.php:1996 +#: libraries/classes/ErrorHandler.php:446 libraries/classes/InsertEdit.php:2005 #: templates/table/index_form.twig:167 templates/table/index_form.twig:203 msgid "Ignore" msgstr "Игнорирај" #: libraries/classes/Controllers/JavaScriptMessagesController.php:476 -#: libraries/classes/Display/Results.php:2971 +#: libraries/classes/Display/Results.php:2973 #: libraries/classes/Html/Generator.php:75 #: templates/display/results/table.twig:231 #: templates/display/results/table.twig:232 @@ -7170,13 +7170,13 @@ msgid "Table %s already exists!" msgstr "Корисник %s веќе постои!" #: libraries/classes/Controllers/JavaScriptMessagesController.php:708 -#: libraries/classes/InsertEdit.php:326 +#: libraries/classes/InsertEdit.php:335 #: libraries/classes/Navigation/Nodes/NodeDatabaseChild.php:53 msgid "Hide" msgstr "" #: libraries/classes/Controllers/JavaScriptMessagesController.php:709 -#: libraries/classes/Controllers/Table/ChangeController.php:187 +#: libraries/classes/Controllers/Table/ChangeController.php:194 #: templates/database/multi_table_query/form.twig:49 #: templates/database/tracking/tables.twig:19 #: templates/table/tracking/main.twig:33 @@ -7937,7 +7937,7 @@ msgid "Insecure connection" msgstr "" #: libraries/classes/Controllers/Sql/SqlController.php:235 -#: libraries/classes/Sql.php:1153 +#: libraries/classes/Sql.php:1154 #, php-format msgid "Bookmark %s has been created." msgstr "Маркерот %s е креиран." @@ -8002,7 +8002,7 @@ msgstr "Корисник %s веќе постои!" #: libraries/classes/Controllers/Table/RelationController.php:241 #: libraries/classes/Controllers/View/OperationsController.php:87 #: libraries/classes/Database/Routines.php:1224 -#: libraries/classes/Display/Results.php:3693 libraries/classes/Message.php:172 +#: libraries/classes/Display/Results.php:3695 libraries/classes/Message.php:172 #: templates/sql/query.twig:7 msgid "Your SQL query has been executed successfully." msgstr "Вашето SQL барање беше успешно егзекутирано." @@ -8040,8 +8040,8 @@ msgstr "" #: libraries/classes/Controllers/Table/GetFieldController.php:86 #: libraries/classes/Database/Routines.php:1243 -#: libraries/classes/Import.php:149 libraries/classes/InsertEdit.php:220 -#: libraries/classes/Sql.php:967 +#: libraries/classes/Import.php:149 libraries/classes/InsertEdit.php:229 +#: libraries/classes/Sql.php:968 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL врати празен резултат (нула записи)." @@ -8068,7 +8068,7 @@ msgstr "Поглед" #: libraries/classes/Controllers/Table/Partition/TruncateController.php:62 #: libraries/classes/Controllers/View/OperationsController.php:90 #: libraries/classes/Html/Generator.php:856 libraries/classes/Import.php:133 -#: libraries/classes/InsertEdit.php:715 libraries/classes/Message.php:192 +#: libraries/classes/InsertEdit.php:724 libraries/classes/Message.php:192 #: templates/error/generic.twig:37 #: templates/table/structure/display_structure.twig:372 msgid "Error" @@ -8731,45 +8731,45 @@ msgstr "Опаѓачки редослед" msgid "Ascending" msgstr "Растечки редослед" -#: libraries/classes/Display/Results.php:3011 -#: libraries/classes/Display/Results.php:3026 +#: libraries/classes/Display/Results.php:3013 +#: libraries/classes/Display/Results.php:3028 #, fuzzy msgid "The row has been deleted." msgstr "Записот е избришан" -#: libraries/classes/Display/Results.php:3058 +#: libraries/classes/Display/Results.php:3060 #: templates/server/status/processes/list.twig:44 msgid "Kill" msgstr "Прекини" -#: libraries/classes/Display/Results.php:3626 +#: libraries/classes/Display/Results.php:3628 #, fuzzy msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]." msgstr "" "Бројот на записи може да биде приближен. За подетални информации види " "[doc@faq3-11]FAQ 3.11[/doc]" -#: libraries/classes/Display/Results.php:3989 +#: libraries/classes/Display/Results.php:3991 #, php-format msgid "Showing rows %1s - %2s" msgstr "Приказ на редови %1s - %2s" -#: libraries/classes/Display/Results.php:4003 +#: libraries/classes/Display/Results.php:4005 #, php-format msgid "%1$d total, %2$d in query" msgstr "" -#: libraries/classes/Display/Results.php:4008 +#: libraries/classes/Display/Results.php:4010 #, php-format msgid "%d total" msgstr "%d вкупно" -#: libraries/classes/Display/Results.php:4021 libraries/classes/Sql.php:973 +#: libraries/classes/Display/Results.php:4023 libraries/classes/Sql.php:974 #, fuzzy, php-format msgid "Query took %01.4f seconds." msgstr "време на извршување на упитот %01.4f секунди" -#: libraries/classes/Display/Results.php:4352 +#: libraries/classes/Display/Results.php:4354 msgid "Link not found!" msgstr "Врската не е пронајдена!" @@ -9283,7 +9283,7 @@ msgstr "" msgid "%d errors were found during analysis." msgstr "" -#: libraries/classes/Import.php:287 libraries/classes/Sql.php:981 +#: libraries/classes/Import.php:287 libraries/classes/Sql.php:982 msgid "[ROLLBACK occurred.]" msgstr "" @@ -9374,7 +9374,7 @@ msgid "" "removed." msgstr "" -#: libraries/classes/InsertEdit.php:342 +#: libraries/classes/InsertEdit.php:351 #: libraries/classes/Navigation/Nodes/NodeFunction.php:28 #: templates/database/routines/execute_form.twig:18 #: templates/table/search/index.twig:36 @@ -9382,7 +9382,7 @@ msgstr "" msgid "Function" msgstr "Функција" -#: libraries/classes/InsertEdit.php:345 +#: libraries/classes/InsertEdit.php:354 #: libraries/classes/Plugins/Export/ExportHtmlword.php:275 #: libraries/classes/Plugins/Export/ExportHtmlword.php:370 #: libraries/classes/Plugins/Export/ExportLatex.php:543 @@ -9416,12 +9416,12 @@ msgstr "Функција" msgid "Type" msgstr "Вид" -#: libraries/classes/InsertEdit.php:716 templates/import.twig:60 +#: libraries/classes/InsertEdit.php:725 templates/import.twig:60 #: templates/import.twig:85 msgid "The directory you set for upload work cannot be reached." msgstr "Директориумот кој го избравте за праќање не е достапен." -#: libraries/classes/InsertEdit.php:724 +#: libraries/classes/InsertEdit.php:733 #: templates/database/qbe/ins_del_and_or_cell.twig:24 #: templates/server/privileges/privileges_table.twig:32 #: templates/server/privileges/privileges_table.twig:59 @@ -9431,15 +9431,15 @@ msgstr "Директориумот кој го избравте за праќа msgid "Or" msgstr "или" -#: libraries/classes/InsertEdit.php:725 +#: libraries/classes/InsertEdit.php:734 msgid "web server upload directory:" msgstr "директориум за праќање на веб серверот:" -#: libraries/classes/InsertEdit.php:1332 libraries/classes/Sql.php:964 +#: libraries/classes/InsertEdit.php:1341 libraries/classes/Sql.php:965 msgid "Showing SQL query" msgstr "" -#: libraries/classes/InsertEdit.php:1356 libraries/classes/Sql.php:944 +#: libraries/classes/InsertEdit.php:1365 libraries/classes/Sql.php:945 #, php-format msgid "Inserted row id: %1$d" msgstr "" @@ -10461,7 +10461,7 @@ msgstr "Име" #: libraries/classes/Plugins/Export/ExportTexytext.php:464 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:365 #: templates/database/events/editor_form.twig:82 -#: templates/database/routines/editor_form.twig:109 +#: templates/database/routines/editor_form.twig:113 #: templates/database/triggers/editor_form.twig:57 #, fuzzy msgid "Definition" @@ -12110,23 +12110,23 @@ msgstr "" msgid "No newer stable version is available" msgstr "" -#: libraries/classes/Sql.php:497 +#: libraries/classes/Sql.php:498 #, php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "" -#: libraries/classes/Sql.php:961 +#: libraries/classes/Sql.php:962 msgid "Showing as PHP code" msgstr "" -#: libraries/classes/Sql.php:1336 +#: libraries/classes/Sql.php:1337 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " "Edit, Copy and Delete features are not available. %s" msgstr "" -#: libraries/classes/Sql.php:1350 +#: libraries/classes/Sql.php:1351 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, Edit, Copy " @@ -13212,7 +13212,7 @@ msgstr "Складишта" #: templates/config/form_display/input.twig:53 #: templates/database/data_dictionary/index.twig:81 #: templates/database/events/editor_form.twig:102 -#: templates/database/routines/editor_form.twig:163 +#: templates/database/routines/editor_form.twig:167 #: templates/database/structure/table_header.twig:46 templates/indexes.twig:24 #: templates/table/structure/display_partitions.twig:31 #: templates/table/structure/display_structure.twig:483 @@ -13304,7 +13304,7 @@ msgstr "Подредување" #: templates/columns_definitions/table_fields_definitions.twig:36 #: templates/database/operations/index.twig:68 #: templates/database/operations/index.twig:173 -#: templates/database/routines/editor_form.twig:124 +#: templates/database/routines/editor_form.twig:128 #: templates/database/structure/copy_form.twig:50 #: templates/table/operations/index.twig:79 #: templates/table/operations/index.twig:115 @@ -13989,7 +13989,7 @@ msgid "On completion preserve" msgstr "Комплетен INSERT (со имиња на полињата)" #: templates/database/events/editor_form.twig:96 -#: templates/database/routines/editor_form.twig:138 +#: templates/database/routines/editor_form.twig:142 #: templates/database/triggers/editor_form.twig:61 #: templates/view_create.twig:45 msgid "Definer" @@ -14400,53 +14400,54 @@ msgstr "" msgid "Direction" msgstr "Направено" -#: templates/database/routines/editor_form.twig:66 +#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:69 #, fuzzy msgid "Add parameter" msgstr "Додади ново поле" -#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:70 #, fuzzy msgid "Remove last parameter" msgstr "Избриши ја базата на податоци." -#: templates/database/routines/editor_form.twig:71 +#: templates/database/routines/editor_form.twig:75 msgid "Return type" msgstr "" -#: templates/database/routines/editor_form.twig:79 +#: templates/database/routines/editor_form.twig:83 #, fuzzy msgid "Return length/values" msgstr "Должина/Вредност*" -#: templates/database/routines/editor_form.twig:86 +#: templates/database/routines/editor_form.twig:90 #, fuzzy msgid "Return options" msgstr "Опции на табелата" -#: templates/database/routines/editor_form.twig:90 +#: templates/database/routines/editor_form.twig:94 #: templates/database/routines/parameter_row.twig:31 #: templates/database/structure/table_header.twig:42 msgid "Charset" msgstr "Кодна страна" -#: templates/database/routines/editor_form.twig:115 +#: templates/database/routines/editor_form.twig:119 msgid "Is deterministic" msgstr "" -#: templates/database/routines/editor_form.twig:131 +#: templates/database/routines/editor_form.twig:135 #, fuzzy msgid "" "You do not have sufficient privileges to perform this operation; Please " "refer to the documentation for more details." msgstr "Немате право на пристап овде!" -#: templates/database/routines/editor_form.twig:144 +#: templates/database/routines/editor_form.twig:148 #, fuzzy msgid "Security type" msgstr "Вид на упит" -#: templates/database/routines/editor_form.twig:153 +#: templates/database/routines/editor_form.twig:157 msgid "SQL data access" msgstr "" diff --git a/po/ml.po b/po/ml.po index b548390cfe..e4af88abad 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3,9 +3,9 @@ # This file is distributed under the same license as the phpMyAdmin package. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Malayalam \n" "Language-Team: Mongolian \n" "Language-Team: Malay \n" "Language-Team: Burmese , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Norwegian Bokmål \n" "Language-Team: Nepali , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2023-01-28 03:53+0000\n" "Last-Translator: dingo thirteen \n" -"Language-Team: Dutch " -"\n" +"Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1387,7 +1387,7 @@ msgstr "Zoeken:" #: templates/database/operations/index.twig:75 #: templates/database/operations/index.twig:185 #: templates/database/operations/index.twig:225 -#: templates/database/routines/editor_form.twig:176 +#: templates/database/routines/editor_form.twig:180 #: templates/database/routines/execute_form.twig:55 #: templates/database/search/main.twig:74 #: templates/database/triggers/editor_form.twig:69 @@ -4340,7 +4340,7 @@ msgstr "Herken vergrendelde tabellen" #: libraries/classes/Config/Descriptions.php:946 #: libraries/classes/ConfigStorage/UserGroups.php:124 #: libraries/classes/Controllers/JavaScriptMessagesController.php:388 -#: libraries/classes/Display/Results.php:2967 +#: libraries/classes/Display/Results.php:2969 #: libraries/classes/Html/Generator.php:657 #: libraries/classes/Html/Generator.php:908 #: templates/console/bookmark_content.twig:7 templates/console/display.twig:31 @@ -5189,7 +5189,7 @@ msgid "Table %s has been emptied." msgstr "Tabel %s is leeggemaakt." #: libraries/classes/Controllers/Database/StructureController.php:577 -#: libraries/classes/Display/Results.php:3980 +#: libraries/classes/Display/Results.php:3982 #, php-format msgid "" "This view has at least this number of rows. Please refer to " @@ -6714,7 +6714,7 @@ msgid "Show query box" msgstr "SQL-queryveld tonen" #: libraries/classes/Controllers/JavaScriptMessagesController.php:389 -#: libraries/classes/Display/Results.php:3035 +#: libraries/classes/Display/Results.php:3037 #: libraries/classes/Tracking.php:260 templates/console/bookmark_content.twig:7 #: templates/database/central_columns/main.twig:268 #: templates/database/central_columns/main.twig:380 @@ -6983,13 +6983,13 @@ msgstr "Inhoud gegevenspunt" #: libraries/classes/Controllers/JavaScriptMessagesController.php:475 #: libraries/classes/Controllers/JavaScriptMessagesController.php:631 -#: libraries/classes/ErrorHandler.php:446 libraries/classes/InsertEdit.php:1996 +#: libraries/classes/ErrorHandler.php:446 libraries/classes/InsertEdit.php:2005 #: templates/table/index_form.twig:167 templates/table/index_form.twig:203 msgid "Ignore" msgstr "Negeren" #: libraries/classes/Controllers/JavaScriptMessagesController.php:476 -#: libraries/classes/Display/Results.php:2971 +#: libraries/classes/Display/Results.php:2973 #: libraries/classes/Html/Generator.php:75 #: templates/display/results/table.twig:231 #: templates/display/results/table.twig:232 @@ -7590,13 +7590,13 @@ msgid "Table %s already exists!" msgstr "Tabel %s bestaat reeds!" #: libraries/classes/Controllers/JavaScriptMessagesController.php:708 -#: libraries/classes/InsertEdit.php:326 +#: libraries/classes/InsertEdit.php:335 #: libraries/classes/Navigation/Nodes/NodeDatabaseChild.php:53 msgid "Hide" msgstr "Verbergen" #: libraries/classes/Controllers/JavaScriptMessagesController.php:709 -#: libraries/classes/Controllers/Table/ChangeController.php:187 +#: libraries/classes/Controllers/Table/ChangeController.php:194 #: templates/database/multi_table_query/form.twig:49 #: templates/database/tracking/tables.twig:19 #: templates/table/tracking/main.twig:33 @@ -8491,7 +8491,7 @@ msgid "Insecure connection" msgstr "Onveilige verbinding" #: libraries/classes/Controllers/Sql/SqlController.php:235 -#: libraries/classes/Sql.php:1153 +#: libraries/classes/Sql.php:1154 #, php-format msgid "Bookmark %s has been created." msgstr "Bladwijzer %s is aangemaakt." @@ -8556,7 +8556,7 @@ msgstr "Tabel %s bestaat reeds!" #: libraries/classes/Controllers/Table/RelationController.php:241 #: libraries/classes/Controllers/View/OperationsController.php:87 #: libraries/classes/Database/Routines.php:1224 -#: libraries/classes/Display/Results.php:3693 libraries/classes/Message.php:172 +#: libraries/classes/Display/Results.php:3695 libraries/classes/Message.php:172 #: templates/sql/query.twig:7 msgid "Your SQL query has been executed successfully." msgstr "Uw SQL-query is succesvol uitgevoerd." @@ -8594,8 +8594,8 @@ msgstr "Er is een probleem met je vraag." #: libraries/classes/Controllers/Table/GetFieldController.php:86 #: libraries/classes/Database/Routines.php:1243 -#: libraries/classes/Import.php:149 libraries/classes/InsertEdit.php:220 -#: libraries/classes/Sql.php:967 +#: libraries/classes/Import.php:149 libraries/classes/InsertEdit.php:229 +#: libraries/classes/Sql.php:968 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL gaf een lege resultatenset terug (0 rijen)." @@ -8622,7 +8622,7 @@ msgstr "View" #: libraries/classes/Controllers/Table/Partition/TruncateController.php:62 #: libraries/classes/Controllers/View/OperationsController.php:90 #: libraries/classes/Html/Generator.php:856 libraries/classes/Import.php:133 -#: libraries/classes/InsertEdit.php:715 libraries/classes/Message.php:192 +#: libraries/classes/InsertEdit.php:724 libraries/classes/Message.php:192 #: templates/error/generic.twig:37 #: templates/table/structure/display_structure.twig:372 msgid "Error" @@ -9279,41 +9279,41 @@ msgstr "Aflopend" msgid "Ascending" msgstr "Oplopend" -#: libraries/classes/Display/Results.php:3011 -#: libraries/classes/Display/Results.php:3026 +#: libraries/classes/Display/Results.php:3013 +#: libraries/classes/Display/Results.php:3028 msgid "The row has been deleted." msgstr "De rij is verwijderd." -#: libraries/classes/Display/Results.php:3058 +#: libraries/classes/Display/Results.php:3060 #: templates/server/status/processes/list.twig:44 msgid "Kill" msgstr "stop proces" -#: libraries/classes/Display/Results.php:3626 +#: libraries/classes/Display/Results.php:3628 msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]." msgstr "Bij benadering. Zie [doc@faq3-11]FAQ 3.11[/doc]." -#: libraries/classes/Display/Results.php:3989 +#: libraries/classes/Display/Results.php:3991 #, php-format msgid "Showing rows %1s - %2s" msgstr "Weergave van records %1s - %2s" -#: libraries/classes/Display/Results.php:4003 +#: libraries/classes/Display/Results.php:4005 #, php-format msgid "%1$d total, %2$d in query" msgstr "%1$d in totaal, %2$d in de query" -#: libraries/classes/Display/Results.php:4008 +#: libraries/classes/Display/Results.php:4010 #, php-format msgid "%d total" msgstr "%d totaal" -#: libraries/classes/Display/Results.php:4021 libraries/classes/Sql.php:973 +#: libraries/classes/Display/Results.php:4023 libraries/classes/Sql.php:974 #, php-format msgid "Query took %01.4f seconds." msgstr "Query duurde %01.4f seconden." -#: libraries/classes/Display/Results.php:4352 +#: libraries/classes/Display/Results.php:4354 msgid "Link not found!" msgstr "Link niet gevonden!" @@ -9862,7 +9862,7 @@ msgstr "Statische analyse:" msgid "%d errors were found during analysis." msgstr "%d fouten zijn gevonden tijdens de analyse." -#: libraries/classes/Import.php:287 libraries/classes/Sql.php:981 +#: libraries/classes/Import.php:287 libraries/classes/Sql.php:982 msgid "[ROLLBACK occurred.]" msgstr "[ROLLBACK is uitgevoerd]" @@ -9956,7 +9956,7 @@ msgstr "" "De indexen %1$s en %2$s lijken hetzelfde, mogelijk kan een van beide worden " "verwijderd." -#: libraries/classes/InsertEdit.php:342 +#: libraries/classes/InsertEdit.php:351 #: libraries/classes/Navigation/Nodes/NodeFunction.php:28 #: templates/database/routines/execute_form.twig:18 #: templates/table/search/index.twig:36 @@ -9964,7 +9964,7 @@ msgstr "" msgid "Function" msgstr "Functie" -#: libraries/classes/InsertEdit.php:345 +#: libraries/classes/InsertEdit.php:354 #: libraries/classes/Plugins/Export/ExportHtmlword.php:275 #: libraries/classes/Plugins/Export/ExportHtmlword.php:370 #: libraries/classes/Plugins/Export/ExportLatex.php:543 @@ -9998,12 +9998,12 @@ msgstr "Functie" msgid "Type" msgstr "Type" -#: libraries/classes/InsertEdit.php:716 templates/import.twig:60 +#: libraries/classes/InsertEdit.php:725 templates/import.twig:60 #: templates/import.twig:85 msgid "The directory you set for upload work cannot be reached." msgstr "De map die u heeft ingesteld om te uploaden kan niet worden bereikt." -#: libraries/classes/InsertEdit.php:724 +#: libraries/classes/InsertEdit.php:733 #: templates/database/qbe/ins_del_and_or_cell.twig:24 #: templates/server/privileges/privileges_table.twig:32 #: templates/server/privileges/privileges_table.twig:59 @@ -10013,15 +10013,15 @@ msgstr "De map die u heeft ingesteld om te uploaden kan niet worden bereikt." msgid "Or" msgstr "Of" -#: libraries/classes/InsertEdit.php:725 +#: libraries/classes/InsertEdit.php:734 msgid "web server upload directory:" msgstr "uploadmap op webserver:" -#: libraries/classes/InsertEdit.php:1332 libraries/classes/Sql.php:964 +#: libraries/classes/InsertEdit.php:1341 libraries/classes/Sql.php:965 msgid "Showing SQL query" msgstr "Toont SQL-query" -#: libraries/classes/InsertEdit.php:1356 libraries/classes/Sql.php:944 +#: libraries/classes/InsertEdit.php:1365 libraries/classes/Sql.php:945 #, php-format msgid "Inserted row id: %1$d" msgstr "Toegevoegd rijnummer: %1$d" @@ -11086,7 +11086,7 @@ msgstr "Naam" #: libraries/classes/Plugins/Export/ExportTexytext.php:464 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:365 #: templates/database/events/editor_form.twig:82 -#: templates/database/routines/editor_form.twig:109 +#: templates/database/routines/editor_form.twig:113 #: templates/database/triggers/editor_form.twig:57 msgid "Definition" msgstr "Definitie" @@ -12764,16 +12764,16 @@ msgstr "" msgid "No newer stable version is available" msgstr "Er is geen recentere stabiele versie beschikbaar" -#: libraries/classes/Sql.php:497 +#: libraries/classes/Sql.php:498 #, php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "Bladwijzer \"%s\" wordt gebruikt als standaard browsequery." -#: libraries/classes/Sql.php:961 +#: libraries/classes/Sql.php:962 msgid "Showing as PHP code" msgstr "Getoond als PHP-code" -#: libraries/classes/Sql.php:1336 +#: libraries/classes/Sql.php:1337 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " @@ -12783,7 +12783,7 @@ msgstr "" "rasterbewerkingen, checkboxen, Bewerken, Kopiëren en Verwijderen, zijn niet " "beschikbaar. %s" -#: libraries/classes/Sql.php:1350 +#: libraries/classes/Sql.php:1351 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, Edit, Copy " @@ -13913,7 +13913,7 @@ msgstr "Engine" #: templates/config/form_display/input.twig:53 #: templates/database/data_dictionary/index.twig:81 #: templates/database/events/editor_form.twig:102 -#: templates/database/routines/editor_form.twig:163 +#: templates/database/routines/editor_form.twig:167 #: templates/database/structure/table_header.twig:46 templates/indexes.twig:24 #: templates/table/structure/display_partitions.twig:31 #: templates/table/structure/display_structure.twig:483 @@ -13998,7 +13998,7 @@ msgstr "Collatie" #: templates/columns_definitions/table_fields_definitions.twig:36 #: templates/database/operations/index.twig:68 #: templates/database/operations/index.twig:173 -#: templates/database/routines/editor_form.twig:124 +#: templates/database/routines/editor_form.twig:128 #: templates/database/structure/copy_form.twig:50 #: templates/table/operations/index.twig:79 #: templates/table/operations/index.twig:115 @@ -14617,7 +14617,7 @@ msgstr "Na afloop behouden" # Not the best translation, suggestions are welcome #: templates/database/events/editor_form.twig:96 -#: templates/database/routines/editor_form.twig:138 +#: templates/database/routines/editor_form.twig:142 #: templates/database/triggers/editor_form.twig:61 #: templates/view_create.twig:45 msgid "Definer" @@ -15003,37 +15003,38 @@ msgstr "Parameters" msgid "Direction" msgstr "Richting" -#: templates/database/routines/editor_form.twig:66 +#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:69 msgid "Add parameter" msgstr "Parameter toevoegen" -#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:70 msgid "Remove last parameter" msgstr "Laatste parameter verwijderen" -#: templates/database/routines/editor_form.twig:71 +#: templates/database/routines/editor_form.twig:75 msgid "Return type" msgstr "Returntype" -#: templates/database/routines/editor_form.twig:79 +#: templates/database/routines/editor_form.twig:83 msgid "Return length/values" msgstr "Return-lengte/waarden" -#: templates/database/routines/editor_form.twig:86 +#: templates/database/routines/editor_form.twig:90 msgid "Return options" msgstr "Return-opties" -#: templates/database/routines/editor_form.twig:90 +#: templates/database/routines/editor_form.twig:94 #: templates/database/routines/parameter_row.twig:31 #: templates/database/structure/table_header.twig:42 msgid "Charset" msgstr "Karakterset" -#: templates/database/routines/editor_form.twig:115 +#: templates/database/routines/editor_form.twig:119 msgid "Is deterministic" msgstr "Is vast bepaald" -#: templates/database/routines/editor_form.twig:131 +#: templates/database/routines/editor_form.twig:135 msgid "" "You do not have sufficient privileges to perform this operation; Please " "refer to the documentation for more details." @@ -15041,11 +15042,11 @@ msgstr "" "U heeft niet genoeg rechten om deze actie uit te voeren; Kijk a.u.b. naar de " "documentatie voor meer details." -#: templates/database/routines/editor_form.twig:144 +#: templates/database/routines/editor_form.twig:148 msgid "Security type" msgstr "Beveiligingstype" -#: templates/database/routines/editor_form.twig:153 +#: templates/database/routines/editor_form.twig:157 msgid "SQL data access" msgstr "SQL-gegevenstoegang" diff --git a/po/nn.po b/po/nn.po index e444324962..0c01cb418a 100644 --- a/po/nn.po +++ b/po/nn.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Norwegian Nynorsk \n" "Language-Team: Punjabi \n" "Language-Team: LANGUAGE \n" @@ -1136,7 +1136,7 @@ msgstr "" #: templates/database/operations/index.twig:75 #: templates/database/operations/index.twig:185 #: templates/database/operations/index.twig:225 -#: templates/database/routines/editor_form.twig:176 +#: templates/database/routines/editor_form.twig:180 #: templates/database/routines/execute_form.twig:55 #: templates/database/search/main.twig:74 #: templates/database/triggers/editor_form.twig:69 @@ -3840,7 +3840,7 @@ msgstr "" #: libraries/classes/Config/Descriptions.php:946 #: libraries/classes/ConfigStorage/UserGroups.php:124 #: libraries/classes/Controllers/JavaScriptMessagesController.php:388 -#: libraries/classes/Display/Results.php:2967 +#: libraries/classes/Display/Results.php:2969 #: libraries/classes/Html/Generator.php:657 #: libraries/classes/Html/Generator.php:908 #: templates/console/bookmark_content.twig:7 @@ -4632,7 +4632,7 @@ msgid "Table %s has been emptied." msgstr "" #: libraries/classes/Controllers/Database/StructureController.php:577 -#: libraries/classes/Display/Results.php:3980 +#: libraries/classes/Display/Results.php:3982 #, possible-php-format msgid "" "This view has at least this number of rows. Please refer to " @@ -6059,7 +6059,7 @@ msgid "Show query box" msgstr "" #: libraries/classes/Controllers/JavaScriptMessagesController.php:389 -#: libraries/classes/Display/Results.php:3035 +#: libraries/classes/Display/Results.php:3037 #: libraries/classes/Tracking.php:260 #: templates/console/bookmark_content.twig:7 #: templates/database/central_columns/main.twig:268 @@ -6315,14 +6315,14 @@ msgstr "" #: libraries/classes/Controllers/JavaScriptMessagesController.php:475 #: libraries/classes/Controllers/JavaScriptMessagesController.php:631 -#: libraries/classes/ErrorHandler.php:446 libraries/classes/InsertEdit.php:1996 +#: libraries/classes/ErrorHandler.php:446 libraries/classes/InsertEdit.php:2005 #: templates/table/index_form.twig:167 #: templates/table/index_form.twig:203 msgid "Ignore" msgstr "" #: libraries/classes/Controllers/JavaScriptMessagesController.php:476 -#: libraries/classes/Display/Results.php:2971 +#: libraries/classes/Display/Results.php:2973 #: libraries/classes/Html/Generator.php:75 #: templates/display/results/table.twig:231 #: templates/display/results/table.twig:232 @@ -6874,13 +6874,13 @@ msgid "Table %s already exists!" msgstr "" #: libraries/classes/Controllers/JavaScriptMessagesController.php:708 -#: libraries/classes/InsertEdit.php:326 +#: libraries/classes/InsertEdit.php:335 #: libraries/classes/Navigation/Nodes/NodeDatabaseChild.php:53 msgid "Hide" msgstr "" #: libraries/classes/Controllers/JavaScriptMessagesController.php:709 -#: libraries/classes/Controllers/Table/ChangeController.php:187 +#: libraries/classes/Controllers/Table/ChangeController.php:194 #: templates/database/multi_table_query/form.twig:49 #: templates/database/tracking/tables.twig:19 #: templates/table/tracking/main.twig:33 @@ -7631,7 +7631,7 @@ msgid "Insecure connection" msgstr "" #: libraries/classes/Controllers/Sql/SqlController.php:235 -#: libraries/classes/Sql.php:1153 +#: libraries/classes/Sql.php:1154 #, possible-php-format msgid "Bookmark %s has been created." msgstr "" @@ -7695,7 +7695,7 @@ msgstr "" #: libraries/classes/Controllers/Table/RelationController.php:241 #: libraries/classes/Controllers/View/OperationsController.php:87 #: libraries/classes/Database/Routines.php:1224 -#: libraries/classes/Display/Results.php:3693 libraries/classes/Message.php:172 +#: libraries/classes/Display/Results.php:3695 libraries/classes/Message.php:172 #: templates/sql/query.twig:7 msgid "Your SQL query has been executed successfully." msgstr "" @@ -7733,8 +7733,8 @@ msgstr "" #: libraries/classes/Controllers/Table/GetFieldController.php:86 #: libraries/classes/Database/Routines.php:1243 -#: libraries/classes/Import.php:149 libraries/classes/InsertEdit.php:220 -#: libraries/classes/Sql.php:967 +#: libraries/classes/Import.php:149 libraries/classes/InsertEdit.php:229 +#: libraries/classes/Sql.php:968 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "" @@ -7761,7 +7761,7 @@ msgstr "" #: libraries/classes/Controllers/Table/Partition/TruncateController.php:62 #: libraries/classes/Controllers/View/OperationsController.php:90 #: libraries/classes/Html/Generator.php:856 libraries/classes/Import.php:133 -#: libraries/classes/InsertEdit.php:715 libraries/classes/Message.php:192 +#: libraries/classes/InsertEdit.php:724 libraries/classes/Message.php:192 #: templates/error/generic.twig:37 #: templates/table/structure/display_structure.twig:372 msgid "Error" @@ -8396,41 +8396,41 @@ msgstr "" msgid "Ascending" msgstr "" -#: libraries/classes/Display/Results.php:3011 -#: libraries/classes/Display/Results.php:3026 +#: libraries/classes/Display/Results.php:3013 +#: libraries/classes/Display/Results.php:3028 msgid "The row has been deleted." msgstr "" -#: libraries/classes/Display/Results.php:3058 +#: libraries/classes/Display/Results.php:3060 #: templates/server/status/processes/list.twig:44 msgid "Kill" msgstr "" -#: libraries/classes/Display/Results.php:3626 +#: libraries/classes/Display/Results.php:3628 msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]." msgstr "" -#: libraries/classes/Display/Results.php:3989 +#: libraries/classes/Display/Results.php:3991 #, possible-php-format msgid "Showing rows %1s - %2s" msgstr "" -#: libraries/classes/Display/Results.php:4003 +#: libraries/classes/Display/Results.php:4005 #, possible-php-format msgid "%1$d total, %2$d in query" msgstr "" -#: libraries/classes/Display/Results.php:4008 +#: libraries/classes/Display/Results.php:4010 #, possible-php-format msgid "%d total" msgstr "" -#: libraries/classes/Display/Results.php:4021 libraries/classes/Sql.php:973 +#: libraries/classes/Display/Results.php:4023 libraries/classes/Sql.php:974 #, possible-php-format msgid "Query took %01.4f seconds." msgstr "" -#: libraries/classes/Display/Results.php:4352 +#: libraries/classes/Display/Results.php:4354 msgid "Link not found!" msgstr "" @@ -8916,7 +8916,7 @@ msgstr "" msgid "%d errors were found during analysis." msgstr "" -#: libraries/classes/Import.php:287 libraries/classes/Sql.php:981 +#: libraries/classes/Import.php:287 libraries/classes/Sql.php:982 msgid "[ROLLBACK occurred.]" msgstr "" @@ -9007,7 +9007,7 @@ msgid "" "removed." msgstr "" -#: libraries/classes/InsertEdit.php:342 +#: libraries/classes/InsertEdit.php:351 #: libraries/classes/Navigation/Nodes/NodeFunction.php:28 #: templates/database/routines/execute_form.twig:18 #: templates/table/search/index.twig:36 @@ -9015,7 +9015,7 @@ msgstr "" msgid "Function" msgstr "" -#: libraries/classes/InsertEdit.php:345 +#: libraries/classes/InsertEdit.php:354 #: libraries/classes/Plugins/Export/ExportHtmlword.php:275 #: libraries/classes/Plugins/Export/ExportHtmlword.php:370 #: libraries/classes/Plugins/Export/ExportLatex.php:543 @@ -9050,13 +9050,13 @@ msgstr "" msgid "Type" msgstr "" -#: libraries/classes/InsertEdit.php:716 +#: libraries/classes/InsertEdit.php:725 #: templates/import.twig:60 #: templates/import.twig:85 msgid "The directory you set for upload work cannot be reached." msgstr "" -#: libraries/classes/InsertEdit.php:724 +#: libraries/classes/InsertEdit.php:733 #: templates/database/qbe/ins_del_and_or_cell.twig:24 #: templates/server/privileges/privileges_table.twig:32 #: templates/server/privileges/privileges_table.twig:59 @@ -9066,15 +9066,15 @@ msgstr "" msgid "Or" msgstr "" -#: libraries/classes/InsertEdit.php:725 +#: libraries/classes/InsertEdit.php:734 msgid "web server upload directory:" msgstr "" -#: libraries/classes/InsertEdit.php:1332 libraries/classes/Sql.php:964 +#: libraries/classes/InsertEdit.php:1341 libraries/classes/Sql.php:965 msgid "Showing SQL query" msgstr "" -#: libraries/classes/InsertEdit.php:1356 libraries/classes/Sql.php:944 +#: libraries/classes/InsertEdit.php:1365 libraries/classes/Sql.php:945 #, possible-php-format msgid "Inserted row id: %1$d" msgstr "" @@ -10079,7 +10079,7 @@ msgstr "" #: libraries/classes/Plugins/Export/ExportTexytext.php:464 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:365 #: templates/database/events/editor_form.twig:82 -#: templates/database/routines/editor_form.twig:109 +#: templates/database/routines/editor_form.twig:113 #: templates/database/triggers/editor_form.twig:57 msgid "Definition" msgstr "" @@ -11611,23 +11611,23 @@ msgstr "" msgid "No newer stable version is available" msgstr "" -#: libraries/classes/Sql.php:497 +#: libraries/classes/Sql.php:498 #, possible-php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "" -#: libraries/classes/Sql.php:961 +#: libraries/classes/Sql.php:962 msgid "Showing as PHP code" msgstr "" -#: libraries/classes/Sql.php:1336 +#: libraries/classes/Sql.php:1337 #, possible-php-format msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " "Edit, Copy and Delete features are not available. %s" msgstr "" -#: libraries/classes/Sql.php:1350 +#: libraries/classes/Sql.php:1351 #, possible-php-format msgid "" "Current selection does not contain a unique column. Grid edit, Edit, Copy " @@ -12697,7 +12697,7 @@ msgstr "" #: templates/config/form_display/input.twig:53 #: templates/database/data_dictionary/index.twig:81 #: templates/database/events/editor_form.twig:102 -#: templates/database/routines/editor_form.twig:163 +#: templates/database/routines/editor_form.twig:167 #: templates/database/structure/table_header.twig:46 #: templates/indexes.twig:24 #: templates/table/structure/display_partitions.twig:31 @@ -12778,7 +12778,7 @@ msgstr "" #: templates/columns_definitions/table_fields_definitions.twig:36 #: templates/database/operations/index.twig:68 #: templates/database/operations/index.twig:173 -#: templates/database/routines/editor_form.twig:124 +#: templates/database/routines/editor_form.twig:128 #: templates/database/structure/copy_form.twig:50 #: templates/table/operations/index.twig:79 #: templates/table/operations/index.twig:115 @@ -13409,7 +13409,7 @@ msgid "On completion preserve" msgstr "" #: templates/database/events/editor_form.twig:96 -#: templates/database/routines/editor_form.twig:138 +#: templates/database/routines/editor_form.twig:142 #: templates/database/triggers/editor_form.twig:61 #: templates/view_create.twig:45 msgid "Definer" @@ -13799,47 +13799,48 @@ msgstr "" msgid "Direction" msgstr "" -#: templates/database/routines/editor_form.twig:66 +#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:69 msgid "Add parameter" msgstr "" -#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:70 msgid "Remove last parameter" msgstr "" -#: templates/database/routines/editor_form.twig:71 +#: templates/database/routines/editor_form.twig:75 msgid "Return type" msgstr "" -#: templates/database/routines/editor_form.twig:79 +#: templates/database/routines/editor_form.twig:83 msgid "Return length/values" msgstr "" -#: templates/database/routines/editor_form.twig:86 +#: templates/database/routines/editor_form.twig:90 msgid "Return options" msgstr "" -#: templates/database/routines/editor_form.twig:90 +#: templates/database/routines/editor_form.twig:94 #: templates/database/routines/parameter_row.twig:31 #: templates/database/structure/table_header.twig:42 msgid "Charset" msgstr "" -#: templates/database/routines/editor_form.twig:115 +#: templates/database/routines/editor_form.twig:119 msgid "Is deterministic" msgstr "" -#: templates/database/routines/editor_form.twig:131 +#: templates/database/routines/editor_form.twig:135 msgid "" "You do not have sufficient privileges to perform this operation; Please " "refer to the documentation for more details." msgstr "" -#: templates/database/routines/editor_form.twig:144 +#: templates/database/routines/editor_form.twig:148 msgid "Security type" msgstr "" -#: templates/database/routines/editor_form.twig:153 +#: templates/database/routines/editor_form.twig:157 msgid "SQL data access" msgstr "" diff --git a/po/pl.po b/po/pl.po index 8ab2ad4b02..3cd262a13e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,9 +1,9 @@ # iMutrix , 2012. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-09-04 23:40+0000\n" "Last-Translator: Kozioł Marcin \n" "Language-Team: Polish \n" "Language-Team: Portuguese \n" "Language-Team: Portuguese (Brazil) \n" "Language-Team: Réunion Creole , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2023-01-28 03:53+0000\n" "Last-Translator: liviuconcioiu \n" "Language-Team: Romanian acest articol" +"performanța. De asemenea, vezi acest articol" #: libraries/advisory_rules_generic.php:697 #, php-format @@ -1404,7 +1404,7 @@ msgstr "Caută:" #: templates/database/operations/index.twig:75 #: templates/database/operations/index.twig:185 #: templates/database/operations/index.twig:225 -#: templates/database/routines/editor_form.twig:176 +#: templates/database/routines/editor_form.twig:180 #: templates/database/routines/execute_form.twig:55 #: templates/database/search/main.twig:74 #: templates/database/triggers/editor_form.twig:69 @@ -2277,9 +2277,9 @@ msgid "" "The number of bytes a script is allowed to allocate, e.g. [kbd]32M[/kbd] " "([kbd]-1[/kbd] for no limit and [kbd]0[/kbd] for no change)." msgstr "" -"Numărul de octeți pe care un script poate să-l aloce, de exemplu: " -"[kbd]32M[/kbd] ([kbd]-1[/kbd] pentru nicio limită și ([kbd]0[/kbd] pentru " -"nicio modificare)." +"Numărul de octeți pe care un script poate să-l aloce, de exemplu: [kbd]32M[/" +"kbd] ([kbd]-1[/kbd] pentru nicio limită și ([kbd]0[/kbd] pentru nicio " +"modificare)." #: libraries/classes/Config/Descriptions.php:291 msgid "In the navigation panel, replaces the database tree with a selector" @@ -4401,7 +4401,7 @@ msgstr "Omite tabele blocate" #: libraries/classes/Config/Descriptions.php:946 #: libraries/classes/ConfigStorage/UserGroups.php:124 #: libraries/classes/Controllers/JavaScriptMessagesController.php:388 -#: libraries/classes/Display/Results.php:2967 +#: libraries/classes/Display/Results.php:2969 #: libraries/classes/Html/Generator.php:657 #: libraries/classes/Html/Generator.php:908 #: templates/console/bookmark_content.twig:7 templates/console/display.twig:31 @@ -5235,7 +5235,7 @@ msgid "Table %s has been emptied." msgstr "Tabelul %s a fost golit." #: libraries/classes/Controllers/Database/StructureController.php:577 -#: libraries/classes/Display/Results.php:3980 +#: libraries/classes/Display/Results.php:3982 #, php-format msgid "" "This view has at least this number of rows. Please refer to " @@ -6747,7 +6747,7 @@ msgid "Show query box" msgstr "Arată caseta de interogare" #: libraries/classes/Controllers/JavaScriptMessagesController.php:389 -#: libraries/classes/Display/Results.php:3035 +#: libraries/classes/Display/Results.php:3037 #: libraries/classes/Tracking.php:260 templates/console/bookmark_content.twig:7 #: templates/database/central_columns/main.twig:268 #: templates/database/central_columns/main.twig:380 @@ -7007,13 +7007,13 @@ msgstr "Conținut punct de date" #: libraries/classes/Controllers/JavaScriptMessagesController.php:475 #: libraries/classes/Controllers/JavaScriptMessagesController.php:631 -#: libraries/classes/ErrorHandler.php:446 libraries/classes/InsertEdit.php:1996 +#: libraries/classes/ErrorHandler.php:446 libraries/classes/InsertEdit.php:2005 #: templates/table/index_form.twig:167 templates/table/index_form.twig:203 msgid "Ignore" msgstr "Ignoră" #: libraries/classes/Controllers/JavaScriptMessagesController.php:476 -#: libraries/classes/Display/Results.php:2971 +#: libraries/classes/Display/Results.php:2973 #: libraries/classes/Html/Generator.php:75 #: templates/display/results/table.twig:231 #: templates/display/results/table.twig:232 @@ -7611,13 +7611,13 @@ msgid "Table %s already exists!" msgstr "Tabelul %s există deja!" #: libraries/classes/Controllers/JavaScriptMessagesController.php:708 -#: libraries/classes/InsertEdit.php:326 +#: libraries/classes/InsertEdit.php:335 #: libraries/classes/Navigation/Nodes/NodeDatabaseChild.php:53 msgid "Hide" msgstr "Ascunde" #: libraries/classes/Controllers/JavaScriptMessagesController.php:709 -#: libraries/classes/Controllers/Table/ChangeController.php:187 +#: libraries/classes/Controllers/Table/ChangeController.php:194 #: templates/database/multi_table_query/form.twig:49 #: templates/database/tracking/tables.twig:19 #: templates/table/tracking/main.twig:33 @@ -8465,7 +8465,7 @@ msgid "Insecure connection" msgstr "Conexiune nesigură" #: libraries/classes/Controllers/Sql/SqlController.php:235 -#: libraries/classes/Sql.php:1153 +#: libraries/classes/Sql.php:1154 #, php-format msgid "Bookmark %s has been created." msgstr "Semnul de carte %s a fost creat." @@ -8529,7 +8529,7 @@ msgstr "Tabelul %s există deja!" #: libraries/classes/Controllers/Table/RelationController.php:241 #: libraries/classes/Controllers/View/OperationsController.php:87 #: libraries/classes/Database/Routines.php:1224 -#: libraries/classes/Display/Results.php:3693 libraries/classes/Message.php:172 +#: libraries/classes/Display/Results.php:3695 libraries/classes/Message.php:172 #: templates/sql/query.twig:7 msgid "Your SQL query has been executed successfully." msgstr "Interogarea SQL a fost executată cu succes." @@ -8572,8 +8572,8 @@ msgstr "Există prea multe asocieri fără indexuri." #: libraries/classes/Controllers/Table/GetFieldController.php:86 #: libraries/classes/Database/Routines.php:1243 -#: libraries/classes/Import.php:149 libraries/classes/InsertEdit.php:220 -#: libraries/classes/Sql.php:967 +#: libraries/classes/Import.php:149 libraries/classes/InsertEdit.php:229 +#: libraries/classes/Sql.php:968 msgid "MySQL returned an empty result set (i.e. zero rows)." msgstr "MySQL a returnat un set de rezultate gol (adică zero rânduri)." @@ -8600,7 +8600,7 @@ msgstr "Vezi" #: libraries/classes/Controllers/Table/Partition/TruncateController.php:62 #: libraries/classes/Controllers/View/OperationsController.php:90 #: libraries/classes/Html/Generator.php:856 libraries/classes/Import.php:133 -#: libraries/classes/InsertEdit.php:715 libraries/classes/Message.php:192 +#: libraries/classes/InsertEdit.php:724 libraries/classes/Message.php:192 #: templates/error/generic.twig:37 #: templates/table/structure/display_structure.twig:372 msgid "Error" @@ -9266,43 +9266,43 @@ msgstr "Descrescător" msgid "Ascending" msgstr "Crescător" -#: libraries/classes/Display/Results.php:3011 -#: libraries/classes/Display/Results.php:3026 +#: libraries/classes/Display/Results.php:3013 +#: libraries/classes/Display/Results.php:3028 msgid "The row has been deleted." msgstr "Rândul a fost șters." -#: libraries/classes/Display/Results.php:3058 +#: libraries/classes/Display/Results.php:3060 #: templates/server/status/processes/list.twig:44 #, fuzzy msgid "Kill" msgstr "Oprește" -#: libraries/classes/Display/Results.php:3626 +#: libraries/classes/Display/Results.php:3628 msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]." msgstr "" "Poate fi aproximativ. Vezi [doc@faq3-11]Întrebări frecvente 3.11[/doc]." -#: libraries/classes/Display/Results.php:3989 +#: libraries/classes/Display/Results.php:3991 #, php-format msgid "Showing rows %1s - %2s" msgstr "Arăt rândurile %1s - %2s" -#: libraries/classes/Display/Results.php:4003 +#: libraries/classes/Display/Results.php:4005 #, php-format msgid "%1$d total, %2$d in query" msgstr "%1$d în total, %2$d în interogare" -#: libraries/classes/Display/Results.php:4008 +#: libraries/classes/Display/Results.php:4010 #, php-format msgid "%d total" msgstr "Total %d" -#: libraries/classes/Display/Results.php:4021 libraries/classes/Sql.php:973 +#: libraries/classes/Display/Results.php:4023 libraries/classes/Sql.php:974 #, php-format msgid "Query took %01.4f seconds." msgstr "Interogarea a durat %01.4f secunde." -#: libraries/classes/Display/Results.php:4352 +#: libraries/classes/Display/Results.php:4354 msgid "Link not found!" msgstr "Legătură negăsită!" @@ -9845,7 +9845,7 @@ msgstr "Analiză statică:" msgid "%d errors were found during analysis." msgstr "Au fost găsite %d erori în timpul analizei." -#: libraries/classes/Import.php:287 libraries/classes/Sql.php:981 +#: libraries/classes/Import.php:287 libraries/classes/Sql.php:982 msgid "[ROLLBACK occurred.]" msgstr "[ROLLBACK s-a făcut.]" @@ -9939,7 +9939,7 @@ msgid "" msgstr "" "Indexurile %1$s și %2$s par să fie egale și unul ar putea fi înlăturat." -#: libraries/classes/InsertEdit.php:342 +#: libraries/classes/InsertEdit.php:351 #: libraries/classes/Navigation/Nodes/NodeFunction.php:28 #: templates/database/routines/execute_form.twig:18 #: templates/table/search/index.twig:36 @@ -9947,7 +9947,7 @@ msgstr "" msgid "Function" msgstr "Funcție" -#: libraries/classes/InsertEdit.php:345 +#: libraries/classes/InsertEdit.php:354 #: libraries/classes/Plugins/Export/ExportHtmlword.php:275 #: libraries/classes/Plugins/Export/ExportHtmlword.php:370 #: libraries/classes/Plugins/Export/ExportLatex.php:543 @@ -9981,12 +9981,12 @@ msgstr "Funcție" msgid "Type" msgstr "Tip" -#: libraries/classes/InsertEdit.php:716 templates/import.twig:60 +#: libraries/classes/InsertEdit.php:725 templates/import.twig:60 #: templates/import.twig:85 msgid "The directory you set for upload work cannot be reached." msgstr "Directorul pe care l-ai setat pentru încărcare nu poate fi găsit." -#: libraries/classes/InsertEdit.php:724 +#: libraries/classes/InsertEdit.php:733 #: templates/database/qbe/ins_del_and_or_cell.twig:24 #: templates/server/privileges/privileges_table.twig:32 #: templates/server/privileges/privileges_table.twig:59 @@ -9996,15 +9996,15 @@ msgstr "Directorul pe care l-ai setat pentru încărcare nu poate fi găsit." msgid "Or" msgstr "Sau" -#: libraries/classes/InsertEdit.php:725 +#: libraries/classes/InsertEdit.php:734 msgid "web server upload directory:" msgstr "director încărcare pe server web:" -#: libraries/classes/InsertEdit.php:1332 libraries/classes/Sql.php:964 +#: libraries/classes/InsertEdit.php:1341 libraries/classes/Sql.php:965 msgid "Showing SQL query" msgstr "Arăt interogarea SQL" -#: libraries/classes/InsertEdit.php:1356 libraries/classes/Sql.php:944 +#: libraries/classes/InsertEdit.php:1365 libraries/classes/Sql.php:945 #, php-format msgid "Inserted row id: %1$d" msgstr "ID rând inserat: %1$d" @@ -11064,7 +11064,7 @@ msgstr "Nume" #: libraries/classes/Plugins/Export/ExportTexytext.php:464 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:365 #: templates/database/events/editor_form.twig:82 -#: templates/database/routines/editor_form.twig:109 +#: templates/database/routines/editor_form.twig:113 #: templates/database/triggers/editor_form.twig:57 msgid "Definition" msgstr "Definiție" @@ -12775,16 +12775,16 @@ msgstr "" msgid "No newer stable version is available" msgstr "Nu este disponibilă nicio versiune stabilă mai nouă" -#: libraries/classes/Sql.php:497 +#: libraries/classes/Sql.php:498 #, php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "Folosește semnul de carte „%s” ca interogare de răsfoire implicită." -#: libraries/classes/Sql.php:961 +#: libraries/classes/Sql.php:962 msgid "Showing as PHP code" msgstr "Arăt drept cod PHP" -#: libraries/classes/Sql.php:1336 +#: libraries/classes/Sql.php:1337 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " @@ -12793,7 +12793,7 @@ msgstr "" "Selecția actuală nu conține o coloană unică. Funcționalitățile editare " "grilă, bifă, editează, copiază și șterge nu sunt disponibile. %s" -#: libraries/classes/Sql.php:1350 +#: libraries/classes/Sql.php:1351 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, Edit, Copy " @@ -13918,7 +13918,7 @@ msgstr "Motor" #: templates/config/form_display/input.twig:53 #: templates/database/data_dictionary/index.twig:81 #: templates/database/events/editor_form.twig:102 -#: templates/database/routines/editor_form.twig:163 +#: templates/database/routines/editor_form.twig:167 #: templates/database/structure/table_header.twig:46 templates/indexes.twig:24 #: templates/table/structure/display_partitions.twig:31 #: templates/table/structure/display_structure.twig:483 @@ -14009,7 +14009,7 @@ msgstr "Colaționare" #: templates/columns_definitions/table_fields_definitions.twig:36 #: templates/database/operations/index.twig:68 #: templates/database/operations/index.twig:173 -#: templates/database/routines/editor_form.twig:124 +#: templates/database/routines/editor_form.twig:128 #: templates/database/structure/copy_form.twig:50 #: templates/table/operations/index.twig:79 #: templates/table/operations/index.twig:115 @@ -14633,7 +14633,7 @@ msgid "On completion preserve" msgstr "Păstrare definitivă" #: templates/database/events/editor_form.twig:96 -#: templates/database/routines/editor_form.twig:138 +#: templates/database/routines/editor_form.twig:142 #: templates/database/triggers/editor_form.twig:61 #: templates/view_create.twig:45 #, fuzzy @@ -15030,37 +15030,38 @@ msgstr "Parametri" msgid "Direction" msgstr "Direcție" -#: templates/database/routines/editor_form.twig:66 +#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:69 msgid "Add parameter" msgstr "Adaugă parametru" -#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:70 msgid "Remove last parameter" msgstr "Înlătură ultimul parametru" -#: templates/database/routines/editor_form.twig:71 +#: templates/database/routines/editor_form.twig:75 msgid "Return type" msgstr "Tip de revenire" -#: templates/database/routines/editor_form.twig:79 +#: templates/database/routines/editor_form.twig:83 msgid "Return length/values" msgstr "Lungime/valori revenire" -#: templates/database/routines/editor_form.twig:86 +#: templates/database/routines/editor_form.twig:90 msgid "Return options" msgstr "Opțiuni revenire" -#: templates/database/routines/editor_form.twig:90 +#: templates/database/routines/editor_form.twig:94 #: templates/database/routines/parameter_row.twig:31 #: templates/database/structure/table_header.twig:42 msgid "Charset" msgstr "Set de caractere" -#: templates/database/routines/editor_form.twig:115 +#: templates/database/routines/editor_form.twig:119 msgid "Is deterministic" msgstr "Este determinat" -#: templates/database/routines/editor_form.twig:131 +#: templates/database/routines/editor_form.twig:135 msgid "" "You do not have sufficient privileges to perform this operation; Please " "refer to the documentation for more details." @@ -15068,11 +15069,11 @@ msgstr "" "Nu ai suficiente privilegii pentru a efectua această operațiune; Te rog " "consultă documentația pentru mai multe detalii." -#: templates/database/routines/editor_form.twig:144 +#: templates/database/routines/editor_form.twig:148 msgid "Security type" msgstr "Tip de securitate" -#: templates/database/routines/editor_form.twig:153 +#: templates/database/routines/editor_form.twig:157 msgid "SQL data access" msgstr "Acces la date SQL" diff --git a/po/ru.po b/po/ru.po index d87da029d2..115631f53d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,9 +1,9 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-10-18 17:02+0000\n" "Last-Translator: Evgeniy Khramov \n" "Language-Team: Russian \n" "Language-Team: Sinhala \n" "Language-Team: Slovak \n" "Language-Team: Slovenian \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Serbian (latin) , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-05-03 16:53+0000\n" "Last-Translator: Erik Fornander \n" "Language-Team: Swedish , YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Tamil திசைப்பாடு" -#: templates/database/routines/editor_form.twig:66 +#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:69 msgid "Add parameter" msgstr "மதிப்புருவை சேர்க்க" -#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:70 msgid "Remove last parameter" msgstr "கடைசி மதிப்புருவை நீக்குக" -#: templates/database/routines/editor_form.twig:71 +#: templates/database/routines/editor_form.twig:75 msgid "Return type" msgstr "" -#: templates/database/routines/editor_form.twig:79 +#: templates/database/routines/editor_form.twig:83 msgid "Return length/values" msgstr "" -#: templates/database/routines/editor_form.twig:86 +#: templates/database/routines/editor_form.twig:90 msgid "Return options" msgstr "செயல்கள்->திருப்பியளிதல் விருப்பங்கள்" -#: templates/database/routines/editor_form.twig:90 +#: templates/database/routines/editor_form.twig:94 #: templates/database/routines/parameter_row.twig:31 #: templates/database/structure/table_header.twig:42 msgid "Charset" msgstr "எழுத்துக்கணம்" -#: templates/database/routines/editor_form.twig:115 +#: templates/database/routines/editor_form.twig:119 msgid "Is deterministic" msgstr "" -#: templates/database/routines/editor_form.twig:131 +#: templates/database/routines/editor_form.twig:135 msgid "" "You do not have sufficient privileges to perform this operation; Please " "refer to the documentation for more details." msgstr "" -#: templates/database/routines/editor_form.twig:144 +#: templates/database/routines/editor_form.twig:148 msgid "Security type" msgstr "" -#: templates/database/routines/editor_form.twig:153 +#: templates/database/routines/editor_form.twig:157 msgid "SQL data access" msgstr "" diff --git a/po/te.po b/po/te.po index 5bcce2784b..a31e130881 100644 --- a/po/te.po +++ b/po/te.po @@ -4,9 +4,9 @@ # FIRST AUTHOR , YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Telugu \n" "Language-Team: Thai \n" "Language-Team: Turkmen , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2023-01-24 22:08+0000\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish \n" "Language-Team: Tatar \n" "Language-Team: Tamazight (Central Atlas) , YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Uyghur \n" "Language-Team: Ukrainian , YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Urdu %s:" msgid "web server upload directory:" msgstr "ویب سرور اپ لوڈ پوشہ سے منتخب کریں %s:" -#: libraries/classes/InsertEdit.php:1332 libraries/classes/Sql.php:964 +#: libraries/classes/InsertEdit.php:1341 libraries/classes/Sql.php:965 msgid "Showing SQL query" msgstr "" -#: libraries/classes/InsertEdit.php:1356 libraries/classes/Sql.php:944 +#: libraries/classes/InsertEdit.php:1365 libraries/classes/Sql.php:945 #, php-format msgid "Inserted row id: %1$d" msgstr "" @@ -11333,7 +11333,7 @@ msgstr "" #: libraries/classes/Plugins/Export/ExportTexytext.php:464 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:365 #: templates/database/events/editor_form.twig:82 -#: templates/database/routines/editor_form.twig:109 +#: templates/database/routines/editor_form.twig:113 #: templates/database/triggers/editor_form.twig:57 #, fuzzy #| msgid "Description" @@ -13001,23 +13001,23 @@ msgstr "" msgid "No newer stable version is available" msgstr "" -#: libraries/classes/Sql.php:497 +#: libraries/classes/Sql.php:498 #, php-format msgid "Using bookmark \"%s\" as default browse query." msgstr "" -#: libraries/classes/Sql.php:961 +#: libraries/classes/Sql.php:962 msgid "Showing as PHP code" msgstr "" -#: libraries/classes/Sql.php:1336 +#: libraries/classes/Sql.php:1337 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " "Edit, Copy and Delete features are not available. %s" msgstr "" -#: libraries/classes/Sql.php:1350 +#: libraries/classes/Sql.php:1351 #, php-format msgid "" "Current selection does not contain a unique column. Grid edit, Edit, Copy " @@ -14148,7 +14148,7 @@ msgstr "" #: templates/config/form_display/input.twig:53 #: templates/database/data_dictionary/index.twig:81 #: templates/database/events/editor_form.twig:102 -#: templates/database/routines/editor_form.twig:163 +#: templates/database/routines/editor_form.twig:167 #: templates/database/structure/table_header.twig:46 templates/indexes.twig:24 #: templates/table/structure/display_partitions.twig:31 #: templates/table/structure/display_structure.twig:483 @@ -14239,7 +14239,7 @@ msgstr "ترتیب" #: templates/columns_definitions/table_fields_definitions.twig:36 #: templates/database/operations/index.twig:68 #: templates/database/operations/index.twig:173 -#: templates/database/routines/editor_form.twig:124 +#: templates/database/routines/editor_form.twig:128 #: templates/database/structure/copy_form.twig:50 #: templates/table/operations/index.twig:79 #: templates/table/operations/index.twig:115 @@ -14983,7 +14983,7 @@ msgid "On completion preserve" msgstr "داخل کرنا مکمل ہوا" #: templates/database/events/editor_form.twig:96 -#: templates/database/routines/editor_form.twig:138 +#: templates/database/routines/editor_form.twig:142 #: templates/database/triggers/editor_form.twig:61 #: templates/view_create.twig:45 msgid "Definer" @@ -15446,53 +15446,54 @@ msgstr "" msgid "Direction" msgstr "بنائیں" -#: templates/database/routines/editor_form.twig:66 +#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:69 msgid "Add parameter" msgstr "" -#: templates/database/routines/editor_form.twig:67 +#: templates/database/routines/editor_form.twig:70 #, fuzzy #| msgid "Remove database" msgid "Remove last parameter" msgstr "کوائفیہ ہٹائیں" -#: templates/database/routines/editor_form.twig:71 +#: templates/database/routines/editor_form.twig:75 msgid "Return type" msgstr "" -#: templates/database/routines/editor_form.twig:79 +#: templates/database/routines/editor_form.twig:83 msgid "Return length/values" msgstr "" -#: templates/database/routines/editor_form.twig:86 +#: templates/database/routines/editor_form.twig:90 #, fuzzy #| msgid "Action" msgid "Return options" msgstr "عمل" -#: templates/database/routines/editor_form.twig:90 +#: templates/database/routines/editor_form.twig:94 #: templates/database/routines/parameter_row.twig:31 #: templates/database/structure/table_header.twig:42 msgid "Charset" msgstr "" -#: templates/database/routines/editor_form.twig:115 +#: templates/database/routines/editor_form.twig:119 msgid "Is deterministic" msgstr "" -#: templates/database/routines/editor_form.twig:131 +#: templates/database/routines/editor_form.twig:135 msgid "" "You do not have sufficient privileges to perform this operation; Please " "refer to the documentation for more details." msgstr "" -#: templates/database/routines/editor_form.twig:144 +#: templates/database/routines/editor_form.twig:148 #, fuzzy #| msgid "Security" msgid "Security type" msgstr "سلامتی" -#: templates/database/routines/editor_form.twig:153 +#: templates/database/routines/editor_form.twig:157 msgid "SQL data access" msgstr "" diff --git a/po/uz.po b/po/uz.po index ca267571c3..321e00b1c5 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1,9 +1,9 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Uzbek , 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 5.2.1-dev\n" +"Project-Id-Version: phpMyAdmin 5.2.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" -"POT-Creation-Date: 2023-01-21 15:49+0000\n" +"POT-Creation-Date: 2023-02-08 15:09+0000\n" "PO-Revision-Date: 2022-02-17 10:35+0000\n" "Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Uzbek (latin) \n" "Language-Team: Vietnamese \n" "Language-Team: West Flemish \n" "Language-Team: Chinese (Simplified) \n" "Language-Team: Chinese (Traditional) Date: Wed, 8 Feb 2023 13:12:29 -0300 Subject: [PATCH 9/9] Fix coding standard issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- psalm-baseline.xml | 24 +++++++++++++------- test/classes/Command/TwigLintCommandTest.php | 2 +- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 95a6530f22..22a79beeff 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -13235,7 +13235,7 @@ $unlimNumRows - + $analyzedSqlResults $analyzedSqlResults['is_affected'] $analyzedSqlResults['is_analyse'] @@ -13273,9 +13273,8 @@ $oneResult['Duration'] $oneResult['Status'] $sortCol - $statement + $statement->expr $table - $tokenList $unlimNumRows $unlimNumRows Message::sanitize($warning) @@ -13304,14 +13303,15 @@ $oneResult['Duration'] $oneResult['Status'] - + $_SESSION['tmpval']['pos'] $_SESSION['tmpval']['possible_as_geometry'] + $statement->expr[0] $columns[$indexColumnName] - + $maxRows $oneFieldMeta $oneMeta @@ -13327,7 +13327,6 @@ $statement $statement $table - $tokenList $unlimNumRows $unlimNumRows $unlimNumRows @@ -13340,7 +13339,10 @@ int|numeric-string string - + + build + + $GLOBALS['cfg']['TablePrimaryKeyOrder'] $_SESSION['tmpval']['max_rows'] $_SESSION['tmpval']['pos'] @@ -13349,17 +13351,23 @@ $maxRows $oneResult['Duration'] $profiling['chart'][$status] + $statement->build() + + $statement + $statement + $statement + $analyzedSqlResults['parser']->errors $analyzedSqlResults['parser']->list $analyzedSqlResults['parser']->list $analyzedSqlResults['parser']->list - $analyzedSqlResults['parser']->list $analyzedSqlResults['statement']->where $analyzedSqlResults['statement']->where[0]->expr $oneFieldMeta->table $oneMeta->name + $statement->expr $pos diff --git a/test/classes/Command/TwigLintCommandTest.php b/test/classes/Command/TwigLintCommandTest.php index c87cac0b5e..5caf77a656 100644 --- a/test/classes/Command/TwigLintCommandTest.php +++ b/test/classes/Command/TwigLintCommandTest.php @@ -14,9 +14,9 @@ use function class_exists; use function sort; use const DIRECTORY_SEPARATOR; -use const ROOT_PATH; use const SORT_NATURAL; use const SORT_REGULAR; +use const TEST_PATH; /** * @covers \PhpMyAdmin\Command\TwigLintCommand