diff --git a/README.md b/README.md
index c0cec7c79..99bc7b32c 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ For an overview of the software quality over time and the evolving metrics, chec
| sequences.php | ❌ | yyyy-mm-dd |
| servers.php | ✅ | 2025-01-19 |
| sql.php | ❌ | yyyy-mm-dd |
-| sqledit.php | ❌ | yyyy-mm-dd |
+| sqledit.php | ✅ | 2025-08-26 |
| tables.php | ❌ | yyyy-mm-dd |
| tablespaces.php | ❌ | yyyy-mm-dd |
| tblproperties.php | ❌ | yyyy-mm-dd |
diff --git a/composer.json b/composer.json
index 63edecc1c..28f3fab97 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,8 @@
"allow-plugins": {
"captainhook/hook-installer": true,
"codeception/c3": true,
- "phpstan/extension-installer": true
+ "phpstan/extension-installer": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
},
"platform": {
"php": "8.1"
@@ -35,6 +36,7 @@
"phpstan/phpstan": "^2.1",
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan-deprecation-rules": "^2.0",
+ "slevomat/coding-standard": "^8.20",
"squizlabs/php_codesniffer": "^3.11",
"vlucas/phpdotenv": "^5.6"
},
@@ -53,7 +55,7 @@
"@dev:lint:phpcs"
],
"dev:lint:php": "parallel-lint --exclude vendor .",
- "dev:lint:phpcs": "phpcs -d memory_limit=256M src/ autoload.php browser.php index.php intro.php login.php servers.php",
+ "dev:lint:phpcs": "phpcs -d memory_limit=256M src/ autoload.php all_db.php browser.php index.php intro.php login.php logout.php server-logout.php servers.php servers-tree.php sqledit.php",
"dev:test": [
"@dev:test:acceptance"
],
diff --git a/composer.lock b/composer.lock
index 6a5b99da1..53d147a60 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "e4ea4bbdd227d58c6e5138fd30e23ea7",
+ "content-hash": "36679070ecb1c1bce809b3b7dfcb3a99",
"packages": [
{
"name": "adodb/adodb-php",
@@ -191,7 +191,7 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.32.0",
+ "version": "v1.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@@ -250,7 +250,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
},
"funding": [
{
@@ -261,6 +261,10 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
@@ -1315,6 +1319,102 @@
],
"time": "2024-05-06T16:37:16+00:00"
},
+ {
+ "name": "dealerdirect/phpcodesniffer-composer-installer",
+ "version": "v1.1.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/PHPCSStandards/composer-installer.git",
+ "reference": "e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1",
+ "reference": "e9cf5e4bbf7eeaf9ef5db34938942602838fc2b1",
+ "shasum": ""
+ },
+ "require": {
+ "composer-plugin-api": "^2.2",
+ "php": ">=5.4",
+ "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0"
+ },
+ "require-dev": {
+ "composer/composer": "^2.2",
+ "ext-json": "*",
+ "ext-zip": "*",
+ "php-parallel-lint/php-parallel-lint": "^1.4.0",
+ "phpcompatibility/php-compatibility": "^9.0",
+ "yoast/phpunit-polyfills": "^1.0"
+ },
+ "type": "composer-plugin",
+ "extra": {
+ "class": "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
+ },
+ "autoload": {
+ "psr-4": {
+ "PHPCSStandards\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Franck Nijhof",
+ "email": "opensource@frenck.dev",
+ "homepage": "https://frenck.dev",
+ "role": "Open source developer"
+ },
+ {
+ "name": "Contributors",
+ "homepage": "https://github.com/PHPCSStandards/composer-installer/graphs/contributors"
+ }
+ ],
+ "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
+ "keywords": [
+ "PHPCodeSniffer",
+ "PHP_CodeSniffer",
+ "code quality",
+ "codesniffer",
+ "composer",
+ "installer",
+ "phpcbf",
+ "phpcs",
+ "plugin",
+ "qa",
+ "quality",
+ "standard",
+ "standards",
+ "style guide",
+ "stylecheck",
+ "tests"
+ ],
+ "support": {
+ "issues": "https://github.com/PHPCSStandards/composer-installer/issues",
+ "security": "https://github.com/PHPCSStandards/composer-installer/security/policy",
+ "source": "https://github.com/PHPCSStandards/composer-installer"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/PHPCSStandards",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/jrfnl",
+ "type": "github"
+ },
+ {
+ "url": "https://opencollective.com/php_codesniffer",
+ "type": "open_collective"
+ },
+ {
+ "url": "https://thanks.dev/u/gh/phpcsstandards",
+ "type": "thanks_dev"
+ }
+ ],
+ "time": "2025-07-17T20:45:56+00:00"
+ },
{
"name": "graham-campbell/result-type",
"version": "v1.1.3",
@@ -1379,22 +1479,22 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.9.3",
+ "version": "7.10.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
+ "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
- "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+ "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
"shasum": ""
},
"require": {
"ext-json": "*",
- "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
- "guzzlehttp/psr7": "^2.7.0",
+ "guzzlehttp/promises": "^2.3",
+ "guzzlehttp/psr7": "^2.8",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -1485,7 +1585,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.9.3"
+ "source": "https://github.com/guzzle/guzzle/tree/7.10.0"
},
"funding": [
{
@@ -1501,20 +1601,20 @@
"type": "tidelift"
}
],
- "time": "2025-03-27T13:37:11+00:00"
+ "time": "2025-08-23T22:36:01+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "2.2.0",
+ "version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c"
+ "reference": "481557b130ef3790cf82b713667b43030dc9c957"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c",
- "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
+ "reference": "481557b130ef3790cf82b713667b43030dc9c957",
"shasum": ""
},
"require": {
@@ -1522,7 +1622,7 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
- "phpunit/phpunit": "^8.5.39 || ^9.6.20"
+ "phpunit/phpunit": "^8.5.44 || ^9.6.25"
},
"type": "library",
"extra": {
@@ -1568,7 +1668,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/2.2.0"
+ "source": "https://github.com/guzzle/promises/tree/2.3.0"
},
"funding": [
{
@@ -1584,20 +1684,20 @@
"type": "tidelift"
}
],
- "time": "2025-03-27T13:27:01+00:00"
+ "time": "2025-08-22T14:34:08+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "2.7.1",
+ "version": "2.8.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
+ "reference": "21dc724a0583619cd1652f673303492272778051"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
- "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
+ "reference": "21dc724a0583619cd1652f673303492272778051",
"shasum": ""
},
"require": {
@@ -1613,7 +1713,7 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
"http-interop/http-factory-tests": "0.9.0",
- "phpunit/phpunit": "^8.5.39 || ^9.6.20"
+ "phpunit/phpunit": "^8.5.44 || ^9.6.25"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -1684,7 +1784,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.7.1"
+ "source": "https://github.com/guzzle/psr7/tree/2.8.0"
},
"funding": [
{
@@ -1700,7 +1800,7 @@
"type": "tidelift"
}
],
- "time": "2025-03-27T12:30:47+00:00"
+ "time": "2025-08-23T21:21:41+00:00"
},
{
"name": "masterminds/html5",
@@ -1831,16 +1931,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.6.0",
+ "version": "v5.6.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56"
+ "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/221b0d0fdf1369c71047ad1d18bb5880017bbc56",
- "reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+ "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
"shasum": ""
},
"require": {
@@ -1859,7 +1959,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.0-dev"
+ "dev-master": "5.x-dev"
}
},
"autoload": {
@@ -1883,9 +1983,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
},
- "time": "2025-07-27T20:03:57+00:00"
+ "time": "2025-08-13T20:13:15+00:00"
},
{
"name": "pdepend/pdepend",
@@ -2280,16 +2380,16 @@
},
{
"name": "phpoption/phpoption",
- "version": "1.9.3",
+ "version": "1.9.4",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/php-option.git",
- "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
+ "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
- "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
+ "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d",
+ "reference": "638a154f8d4ee6a5cfa96d6a34dfbe0cffa9566d",
"shasum": ""
},
"require": {
@@ -2297,7 +2397,7 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
- "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
+ "phpunit/phpunit": "^8.5.44 || ^9.6.25 || ^10.5.53 || ^11.5.34"
},
"type": "library",
"extra": {
@@ -2339,7 +2439,7 @@
],
"support": {
"issues": "https://github.com/schmittjoh/php-option/issues",
- "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
+ "source": "https://github.com/schmittjoh/php-option/tree/1.9.4"
},
"funding": [
{
@@ -2351,7 +2451,7 @@
"type": "tidelift"
}
],
- "time": "2024-07-20T21:41:07+00:00"
+ "time": "2025-08-21T11:53:16+00:00"
},
{
"name": "phpstan/extension-installer",
@@ -2401,6 +2501,53 @@
},
"time": "2024-09-04T20:21:43+00:00"
},
+ {
+ "name": "phpstan/phpdoc-parser",
+ "version": "2.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpstan/phpdoc-parser.git",
+ "reference": "b9e61a61e39e02dd90944e9115241c7f7e76bfd8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/b9e61a61e39e02dd90944e9115241c7f7e76bfd8",
+ "reference": "b9e61a61e39e02dd90944e9115241c7f7e76bfd8",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.4 || ^8.0"
+ },
+ "require-dev": {
+ "doctrine/annotations": "^2.0",
+ "nikic/php-parser": "^5.3.0",
+ "php-parallel-lint/php-parallel-lint": "^1.2",
+ "phpstan/extension-installer": "^1.0",
+ "phpstan/phpstan": "^2.0",
+ "phpstan/phpstan-phpunit": "^2.0",
+ "phpstan/phpstan-strict-rules": "^2.0",
+ "phpunit/phpunit": "^9.6",
+ "symfony/process": "^5.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "PHPStan\\PhpDocParser\\": [
+ "src/"
+ ]
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "PHPDoc parser with support for nullable, intersection and generic types",
+ "support": {
+ "issues": "https://github.com/phpstan/phpdoc-parser/issues",
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/2.2.0"
+ },
+ "time": "2025-07-13T07:04:09+00:00"
+ },
{
"name": "phpstan/phpstan",
"version": "2.1.22",
@@ -2829,16 +2976,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "10.5.51",
+ "version": "10.5.53",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "ace160e31aaa317a99c411410c40c502b4be42a4"
+ "reference": "32768472ebfb6969e6c7399f1c7b09009723f653"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ace160e31aaa317a99c411410c40c502b4be42a4",
- "reference": "ace160e31aaa317a99c411410c40c502b4be42a4",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/32768472ebfb6969e6c7399f1c7b09009723f653",
+ "reference": "32768472ebfb6969e6c7399f1c7b09009723f653",
"shasum": ""
},
"require": {
@@ -2910,7 +3057,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.51"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.53"
},
"funding": [
{
@@ -2934,7 +3081,7 @@
"type": "tidelift"
}
],
- "time": "2025-08-12T07:31:25+00:00"
+ "time": "2025-08-20T14:40:06+00:00"
},
{
"name": "psr/container",
@@ -4476,6 +4623,71 @@
],
"time": "2025-06-05T16:05:10+00:00"
},
+ {
+ "name": "slevomat/coding-standard",
+ "version": "8.20.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/slevomat/coding-standard.git",
+ "reference": "b4f9f02edd4e6a586777f0cabe8d05574323f3eb"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b4f9f02edd4e6a586777f0cabe8d05574323f3eb",
+ "reference": "b4f9f02edd4e6a586777f0cabe8d05574323f3eb",
+ "shasum": ""
+ },
+ "require": {
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.1.2",
+ "php": "^7.4 || ^8.0",
+ "phpstan/phpdoc-parser": "^2.2.0",
+ "squizlabs/php_codesniffer": "^3.13.2"
+ },
+ "require-dev": {
+ "phing/phing": "3.0.1|3.1.0",
+ "php-parallel-lint/php-parallel-lint": "1.4.0",
+ "phpstan/phpstan": "2.1.19",
+ "phpstan/phpstan-deprecation-rules": "2.0.3",
+ "phpstan/phpstan-phpunit": "2.0.7",
+ "phpstan/phpstan-strict-rules": "2.0.6",
+ "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.27|12.2.7"
+ },
+ "type": "phpcodesniffer-standard",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "8.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "SlevomatCodingStandard\\": "SlevomatCodingStandard/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
+ "keywords": [
+ "dev",
+ "phpcs"
+ ],
+ "support": {
+ "issues": "https://github.com/slevomat/coding-standard/issues",
+ "source": "https://github.com/slevomat/coding-standard/tree/8.20.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/kukulich",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/slevomat/coding-standard",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2025-07-26T15:35:10+00:00"
+ },
{
"name": "squizlabs/php_codesniffer",
"version": "3.13.2",
@@ -5334,16 +5546,16 @@
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.32.0",
+ "version": "v1.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
+ "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
- "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+ "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
"shasum": ""
},
"require": {
@@ -5392,7 +5604,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
},
"funding": [
{
@@ -5403,16 +5615,20 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
- "time": "2024-09-09T11:45:10+00:00"
+ "time": "2025-06-27T09:58:17+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.32.0",
+ "version": "v1.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -5473,7 +5689,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
},
"funding": [
{
@@ -5484,6 +5700,10 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
@@ -5493,7 +5713,7 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.32.0",
+ "version": "v1.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -5554,7 +5774,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
},
"funding": [
{
@@ -5565,6 +5785,10 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
@@ -5574,7 +5798,7 @@
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.32.0",
+ "version": "v1.33.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
@@ -5634,7 +5858,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
},
"funding": [
{
@@ -5645,6 +5869,10 @@
"url": "https://github.com/fabpot",
"type": "github"
},
+ {
+ "url": "https://github.com/nicolas-grekas",
+ "type": "github"
+ },
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
diff --git a/js/sqledit.js b/js/sqledit.js
new file mode 100644
index 000000000..c496bf7a0
--- /dev/null
+++ b/js/sqledit.js
@@ -0,0 +1,18 @@
+'use strict';
+
+/**
+ * @param {Event} evt
+ */
+function changeServer(evt) {
+ const urlParams = new URLSearchParams();
+ urlParams.set('action', 'sql');
+ urlParams.set('server', server.options[server.selectedIndex].value);
+ urlParams.set('database', database.options[database.selectedIndex].value);
+ urlParams.set('query', query.value);
+ urlParams.set('search_path', search_path.value);
+ if (paginate.checked) {
+ urlParams.set('paginate', 'on');
+ }
+
+ location.href = `sqledit.php?${urlParams.toString()}`;
+}
\ No newline at end of file
diff --git a/locale/af_ZA/LC_MESSAGES/messages.mo b/locale/af_ZA/LC_MESSAGES/messages.mo
index 57257e3b4..985091801 100644
Binary files a/locale/af_ZA/LC_MESSAGES/messages.mo and b/locale/af_ZA/LC_MESSAGES/messages.mo differ
diff --git a/locale/af_ZA/LC_MESSAGES/messages.po b/locale/af_ZA/LC_MESSAGES/messages.po
index 01381be4a..3e93693ac 100644
--- a/locale/af_ZA/LC_MESSAGES/messages.po
+++ b/locale/af_ZA/LC_MESSAGES/messages.po
@@ -134,7 +134,7 @@ msgstr "Kanselleer"
msgid "strsave"
msgstr "Bewaar"
-msgid "strreset"
+msgid "Reset"
msgstr "Herstel"
msgid "strinsert"
@@ -170,7 +170,7 @@ msgstr "Redigeer"
msgid "strcolumn"
msgstr "Kolom"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Kolomme"
msgid "strrows"
@@ -326,10 +326,10 @@ msgstr "Redigeer SQL"
msgid "strruntime"
msgstr "Totale looptyd: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Resultate per bladsy"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "of laai 'n SQL skrip in:"
msgid "strstarttime"
@@ -394,7 +394,7 @@ msgstr "Weergee van komplekse tabel- en skemaname word nie op Windows ondersteun
msgid "strtable"
msgstr "Tabel"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabelle"
msgid "strshowalltables"
@@ -797,14 +797,14 @@ msgstr "Sein gestuur."
msgid "strsignalsentbad"
msgstr "Stuur van sein het misluk."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Alle objekte"
# Views
msgid "strview"
msgstr "Aansig"
-msgid "strviews"
+msgid "Views"
msgstr "Aansigte"
msgid "strshowallviews"
@@ -865,7 +865,7 @@ msgstr "Skep 'n aansig met behulp van 'n toergids"
msgid "strsequence"
msgstr "Reeks"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Reekse"
msgid "strshowallsequences"
@@ -932,7 +932,7 @@ msgstr "Herstel van reeks het misluk."
msgid "strindex"
msgstr "Indeks"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indekse"
msgid "strindexname"
@@ -1005,7 +1005,7 @@ msgid "strclusteredbad"
msgstr "Kluster het misluk."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Reëls"
msgid "strrule"
@@ -1045,7 +1045,7 @@ msgid "strruledroppedbad"
msgstr "Verwydering van die reël het misluk."
# Constraints
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Beperkings"
msgid "strshowallconstraints"
@@ -1139,7 +1139,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Funksie"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funksies"
msgid "strshowallfunctions"
@@ -1206,10 +1206,10 @@ msgid "strlinksymbol"
msgstr "Skakelsimbool"
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Snellers"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Snellers"
msgid "strshowalltriggers"
@@ -1346,7 +1346,7 @@ msgstr "Pseudo"
msgid "strschema"
msgstr "Skema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Skemas"
msgid "strshowallschemas"
@@ -1388,7 +1388,7 @@ msgstr "Skema is gewysig."
msgid "strschemaalteredbad"
msgstr "Skemawysiging het misluk."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Skema-soekpad"
# Reports
@@ -1397,7 +1397,7 @@ msgstr "Skema-soekpad"
msgid "strdomain"
msgstr "Domein"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domeine"
msgid "strshowalldomains"
diff --git a/locale/ar/LC_MESSAGES/messages.mo b/locale/ar/LC_MESSAGES/messages.mo
index 43ab3462b..50216ffac 100644
Binary files a/locale/ar/LC_MESSAGES/messages.mo and b/locale/ar/LC_MESSAGES/messages.mo differ
diff --git a/locale/ar/LC_MESSAGES/messages.po b/locale/ar/LC_MESSAGES/messages.po
index 98eae786a..cfc2582a7 100644
--- a/locale/ar/LC_MESSAGES/messages.po
+++ b/locale/ar/LC_MESSAGES/messages.po
@@ -134,7 +134,7 @@ msgstr "تراجع"
msgid "strsave"
msgstr "حفظ"
-msgid "strreset"
+msgid "Reset"
msgstr "إعادة Reset"
msgid "strinsert"
@@ -167,7 +167,7 @@ msgstr "خاطئ FALSE"
msgid "stredit"
msgstr "تحرير"
-msgid "strcolumns"
+msgid "Columns"
msgstr "أعمدة Columns"
msgid "strrows"
@@ -329,10 +329,10 @@ msgstr "Edit SQL"
msgid "strruntime"
msgstr "Total runtime: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Paginate results"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "or upload an SQL script:"
msgid "strstarttime"
@@ -391,7 +391,7 @@ msgstr "خطأ في الإستيراد عند السطر: %s."
msgid "strtable"
msgstr "جدول Table"
-msgid "strtables"
+msgid "Tables"
msgstr "جداول Tables"
msgid "strshowalltables"
@@ -786,7 +786,7 @@ msgstr "Force"
msgid "strview"
msgstr "View عرض"
-msgid "strviews"
+msgid "Views"
msgstr "عروض Views"
msgid "strshowallviews"
@@ -847,7 +847,7 @@ msgstr "إنشاء عرض View بإستخدام الساحر Wizard."
msgid "strsequence"
msgstr "تسلسل Sequence"
-msgid "strsequences"
+msgid "Sequences"
msgstr "تسلسلات Sequences"
msgid "strshowallsequences"
@@ -914,7 +914,7 @@ msgstr "لقد فشلت إعادة التسلسل."
msgid "strindex"
msgstr "فهرسIndex"
-msgid "strindexes"
+msgid "Indexes"
msgstr "فهارسIndexes"
msgid "strindexname"
@@ -987,7 +987,7 @@ msgid "strclusteredbad"
msgstr "Cluster failed."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "قواعد Rules"
msgid "strrule"
@@ -1027,7 +1027,7 @@ msgid "strruledroppedbad"
msgstr "فشل حذف القاعدة."
# Constraints
-msgid "strconstraints"
+msgid "Constraints"
msgstr "قيود Constraints"
msgid "strshowallconstraints"
@@ -1121,7 +1121,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "دالة Function"
-msgid "strfunctions"
+msgid "Functions"
msgstr "دوال Functions"
msgid "strshowallfunctions"
@@ -1173,10 +1173,10 @@ msgid "strfunctionupdatedbad"
msgstr "لقد فشل تعديل الدالة function."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "محفّز Trigger"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "محفّزات Triggers"
msgid "strshowalltriggers"
@@ -1286,7 +1286,7 @@ msgstr "فشلت عملية حذف النوع."
msgid "strschema"
msgstr "مخطط Schema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "المخططات Schemas"
msgid "strshowallschemas"
@@ -1334,7 +1334,7 @@ msgstr "فشلت عملية تعديل المخطط، لم يتم التعديل
msgid "strdomain"
msgstr "نطاق Domain"
-msgid "strdomains"
+msgid "Domains"
msgstr "نطاقات Domains"
msgid "strshowalldomains"
diff --git a/locale/ca_ES/LC_MESSAGES/messages.mo b/locale/ca_ES/LC_MESSAGES/messages.mo
index f6056482b..0fdee993e 100644
Binary files a/locale/ca_ES/LC_MESSAGES/messages.mo and b/locale/ca_ES/LC_MESSAGES/messages.mo differ
diff --git a/locale/ca_ES/LC_MESSAGES/messages.po b/locale/ca_ES/LC_MESSAGES/messages.po
index 70692df40..e19670962 100644
--- a/locale/ca_ES/LC_MESSAGES/messages.po
+++ b/locale/ca_ES/LC_MESSAGES/messages.po
@@ -164,7 +164,7 @@ msgstr "Habilita AutoCompletat"
msgid "strsave"
msgstr "Desa"
-msgid "strreset"
+msgid "Reset"
msgstr "Restableix"
msgid "strrestart"
@@ -203,7 +203,7 @@ msgstr "Edita"
msgid "strcolumn"
msgstr "Columna"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Columnes"
msgid "strrows"
@@ -362,10 +362,10 @@ msgstr "Edita SQL"
msgid "strruntime"
msgstr "Total temps d'execució: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Pagina els resultats"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "o carrega un script SQL:"
msgid "strstarttime"
@@ -553,7 +553,7 @@ msgstr "No hi ha connexió amb el servidor."
msgid "strtable"
msgstr "Taula"
-msgid "strtables"
+msgid "Tables"
msgstr "Taules"
msgid "strshowalltables"
@@ -1078,7 +1078,7 @@ msgstr "Senyal enviat."
msgid "strsignalsentbad"
msgstr "L'enviament del senyal ha fallat."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Tots els objectes"
msgid "strdatabasealtered"
@@ -1109,7 +1109,7 @@ msgstr "Està segur de voler un clúster de totes les taules de la base de dades
msgid "strview"
msgstr "Vista"
-msgid "strviews"
+msgid "Views"
msgstr "Vistes"
msgid "strshowallviews"
@@ -1188,7 +1188,7 @@ msgstr "Ha d'especificar almenys una vista per eliminar."
msgid "strsequence"
msgstr "Seqüència"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Seqüències"
msgid "strshowallsequences"
@@ -1294,7 +1294,7 @@ msgstr "Ha d'especificar almenys una seqüència per eliminar."
msgid "strindex"
msgstr "Índex"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Índexs"
msgid "strindexname"
@@ -1370,7 +1370,7 @@ msgid "strnoclusteravailable"
msgstr "No hi ha el clúster disponible en l'índex."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Regles"
msgid "strrule"
@@ -1413,7 +1413,7 @@ msgstr "No s'ha pogut eliminar la regla."
msgid "strconstraint"
msgstr "Restricció"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Restriccions"
msgid "strshowallconstraints"
@@ -1507,7 +1507,7 @@ msgstr "A L'ACTUALITZAR"
msgid "strfunction"
msgstr "Funció"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funcions"
msgid "strshowallfunctions"
@@ -1619,10 +1619,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "Ha d'especificar almenys una funció per eliminar."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Disparador"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Disparadors"
msgid "strshowalltriggers"
@@ -1795,7 +1795,7 @@ msgstr "Valors de l'enumeració"
msgid "strschema"
msgstr "Esquema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Esquemes"
msgid "strshowallschemas"
@@ -1837,7 +1837,7 @@ msgstr "Esquema modificat."
msgid "strschemaalteredbad"
msgstr "No s'ha pogut modificar l'esquema."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Camí de cerca de l'esquema"
msgid "strspecifyschematodrop"
@@ -1849,7 +1849,7 @@ msgstr "Ha d'especificar almenys un esquema per eliminar."
msgid "strdomain"
msgstr "Domini"
-msgid "strdomains"
+msgid "Domains"
msgstr "Dominis"
msgid "strshowalldomains"
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.mo b/locale/cs_CZ/LC_MESSAGES/messages.mo
index eb69c6dbb..ab5ab2b88 100644
Binary files a/locale/cs_CZ/LC_MESSAGES/messages.mo and b/locale/cs_CZ/LC_MESSAGES/messages.mo differ
diff --git a/locale/cs_CZ/LC_MESSAGES/messages.po b/locale/cs_CZ/LC_MESSAGES/messages.po
index 6a9a62c61..4ad09261b 100644
--- a/locale/cs_CZ/LC_MESSAGES/messages.po
+++ b/locale/cs_CZ/LC_MESSAGES/messages.po
@@ -164,7 +164,7 @@ msgstr "Povolit automatické dokončení"
msgid "strsave"
msgstr "Uložit"
-msgid "strreset"
+msgid "Reset"
msgstr "Resetovat"
msgid "strrestart"
@@ -203,7 +203,7 @@ msgstr "Upravit"
msgid "strcolumn"
msgstr "Sloupec"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Sloupce"
msgid "strrows"
@@ -362,10 +362,10 @@ msgstr "Upravit SQL"
msgid "strruntime"
msgstr "Celková doba běhu: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Stránkovat výsledky"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "nebo nahrajte skript SQL:"
msgid "strstarttime"
@@ -553,7 +553,7 @@ msgstr "Nelze se připojit k serveru."
msgid "strtable"
msgstr "Tabulka"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabulky"
msgid "strshowalltables"
@@ -1078,7 +1078,7 @@ msgstr "Signál byl odeslán."
msgid "strsignalsentbad"
msgstr "Signál se nezdařilo odeslat."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Všechny objekty"
msgid "strdatabasealtered"
@@ -1109,7 +1109,7 @@ msgstr "Opravdu chcete přeskupit všechny tabulky v databázi „%s“?"
msgid "strview"
msgstr "Pohled"
-msgid "strviews"
+msgid "Views"
msgstr "Pohledy"
msgid "strshowallviews"
@@ -1188,7 +1188,7 @@ msgstr "Pokud chcete odstranit pohledy, tak musíte nejméně jeden vybrat."
msgid "strsequence"
msgstr "Sekvence"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sekvence"
msgid "strshowallsequences"
@@ -1294,7 +1294,7 @@ msgstr "Pokud chcete odstranit sekvence, tak musíte nejméně jednu vybrat."
msgid "strindex"
msgstr "Index"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indexy"
msgid "strindexname"
@@ -1370,7 +1370,7 @@ msgid "strnoclusteravailable"
msgstr "Tabulka není přeskupena podle indexu."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Pravidla"
msgid "strrule"
@@ -1413,7 +1413,7 @@ msgstr "Nezdařilo se odstranit pravidlo."
msgid "strconstraint"
msgstr "Omezení"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Omezení"
msgid "strshowallconstraints"
@@ -1507,7 +1507,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Funkce"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funkce"
msgid "strshowallfunctions"
@@ -1619,10 +1619,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "Pokud chcete odstranit funkce, tak musíte nejméně jednu vybrat."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Trigger"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Triggery"
msgid "strshowalltriggers"
@@ -1795,7 +1795,7 @@ msgstr "Výčtové hodnoty"
msgid "strschema"
msgstr "Schéma"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Schémata"
msgid "strshowallschemas"
@@ -1837,7 +1837,7 @@ msgstr "Změny ve schématu byly provedeny."
msgid "strschemaalteredbad"
msgstr "Nezdařilo se provést změny ve schématu."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Prohledávaná schémata"
msgid "strspecifyschematodrop"
@@ -1849,7 +1849,7 @@ msgstr "Pokud chcete odstranit schémata, tak musíte nejméně jedno vybrat."
msgid "strdomain"
msgstr "Doména"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domény"
msgid "strshowalldomains"
diff --git a/locale/da_DK/LC_MESSAGES/messages.mo b/locale/da_DK/LC_MESSAGES/messages.mo
index 195b9b328..40ce2c350 100644
Binary files a/locale/da_DK/LC_MESSAGES/messages.mo and b/locale/da_DK/LC_MESSAGES/messages.mo differ
diff --git a/locale/da_DK/LC_MESSAGES/messages.po b/locale/da_DK/LC_MESSAGES/messages.po
index 1cec91c54..7e0c3aa8a 100644
--- a/locale/da_DK/LC_MESSAGES/messages.po
+++ b/locale/da_DK/LC_MESSAGES/messages.po
@@ -134,7 +134,7 @@ msgstr "Fortryd"
msgid "strsave"
msgstr "Gem"
-msgid "strreset"
+msgid "Reset"
msgstr "Nulstil"
msgid "strinsert"
@@ -170,7 +170,7 @@ msgstr "Redigere"
msgid "strcolumn"
msgstr "Kolonne"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Kolonner"
msgid "strrows"
@@ -332,10 +332,10 @@ msgstr "Rediger SQL"
msgid "strruntime"
msgstr "Total runtime: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Paginere resultater"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "eller upload et SQL script:"
msgid "strstarttime"
@@ -385,7 +385,7 @@ msgstr "Denne række har ingen unik nøgle."
msgid "strtable"
msgstr "Tabel"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabeller"
msgid "strshowalltables"
@@ -794,7 +794,7 @@ msgstr "Signal sendt."
msgid "strsignalsentbad"
msgstr "Afsendelse af signal mislykkedes."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Alle objekter"
msgid "Structure only"
@@ -807,7 +807,7 @@ msgstr "Struktur og data"
msgid "strview"
msgstr "View"
-msgid "strviews"
+msgid "Views"
msgstr "Views"
msgid "strshowallviews"
@@ -865,7 +865,7 @@ msgstr "Opret view med hjælp af wizard"
msgid "strsequence"
msgstr "Sekvens"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sekvenser"
msgid "strshowallsequences"
@@ -926,7 +926,7 @@ msgstr "Fjernelse af sekvens mislykkedes."
msgid "strindex"
msgstr "Indeks"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indekser"
msgid "strshowallindexes"
@@ -1005,7 +1005,7 @@ msgid "strclusteredbad"
msgstr "Cluster failed."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Regler"
msgid "strrule"
@@ -1045,7 +1045,7 @@ msgid "strruledroppedbad"
msgstr "Det lykkedes ikke at fjerne regel."
# Constraints
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Afgrænsninger"
msgid "strshowallconstraints"
@@ -1139,7 +1139,7 @@ msgstr "VED OPDATERING"
msgid "strfunction"
msgstr "Funktion"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funktioner"
msgid "strshowallfunctions"
@@ -1203,10 +1203,10 @@ msgid "strfunctionupdatedbad"
msgstr "Opdatering af funktion mislykkedes."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Trigger"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Triggere"
msgid "strshowalltriggers"
@@ -1317,7 +1317,7 @@ msgstr "Det lykkedes ikke at fjerne typen."
msgid "strschema"
msgstr "Skema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Skemaer"
msgid "strshowallschemas"
@@ -1364,7 +1364,7 @@ msgstr "jS M, Y g:iA"
msgid "strdomain"
msgstr "Domæne"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domæner"
msgid "strshowalldomains"
diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index ab5483de8..a1ca266b4 100644
Binary files a/locale/de_DE/LC_MESSAGES/messages.mo and b/locale/de_DE/LC_MESSAGES/messages.mo differ
diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index 1c5b16d74..9c0aa009f 100644
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -155,7 +155,7 @@ msgstr "Automatische Vervollständigung einschalten"
msgid "strsave"
msgstr "Speichern"
-msgid "strreset"
+msgid "Reset"
msgstr "Zurücksetzen"
msgid "strinsert"
@@ -191,7 +191,7 @@ msgstr "Bearbeiten"
msgid "strcolumn"
msgstr "Spalte"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Spalten"
msgid "strrows"
@@ -350,10 +350,10 @@ msgstr "SQL bearbeiten"
msgid "strruntime"
msgstr "Laufzeit gesamt: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Ergebnisse seitenweise anzeigen"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "oder laden Sie ein SQL-Script hoch:"
msgid "strstarttime"
@@ -498,7 +498,7 @@ msgstr "Kein Server angegeben!"
msgid "strtable"
msgstr "Tabelle"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabellen"
msgid "strshowalltables"
@@ -1005,7 +1005,7 @@ msgstr "Signal gesendet."
msgid "strsignalsentbad"
msgstr "Senden des Signales fehlgeschlagen."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Alle Objekte"
msgid "strdatabasealtered"
@@ -1021,7 +1021,7 @@ msgstr "Sie müssen mindestens eine Datenbank angeben, die gelöscht werden soll
msgid "strview"
msgstr "Sicht"
-msgid "strviews"
+msgid "Views"
msgstr "Sichten"
msgid "strshowallviews"
@@ -1100,7 +1100,7 @@ msgstr "Sie müssen mindestens eine Sicht angeben, die gelöscht werden soll."
msgid "strsequence"
msgstr "Sequenz"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sequenzen"
msgid "strshowallsequences"
@@ -1197,7 +1197,7 @@ msgstr "Sie müssen mindestens eine Sequenz angeben, die gelöscht werden soll."
msgid "strindex"
msgstr "Index"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indizes"
msgid "strindexname"
@@ -1270,7 +1270,7 @@ msgid "strclusteredbad"
msgstr "Clustern fehlgeschlagen."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Regeln"
msgid "strrule"
@@ -1313,7 +1313,7 @@ msgstr "Löschen der Regel fehlgeschlagen."
msgid "strconstraint"
msgstr "Constraint"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Constraints"
msgid "strshowallconstraints"
@@ -1407,7 +1407,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Funktion"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funktionen"
msgid "strshowallfunctions"
@@ -1519,10 +1519,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "Sie müssen mindestens eine Funktion angeben, die gelöscht werden soll."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Trigger"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Trigger"
msgid "strshowalltriggers"
@@ -1695,7 +1695,7 @@ msgstr "Wert"
msgid "strschema"
msgstr "Schema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Schemata"
msgid "strshowallschemas"
@@ -1737,7 +1737,7 @@ msgstr "Schema geändert."
msgid "strschemaalteredbad"
msgstr "Ändern des Schemas fehlgeschlagen."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Schemasuchpfad"
msgid "strspecifyschematodrop"
@@ -1749,7 +1749,7 @@ msgstr "Sie müssen mindestens ein Schema angeben, das gelöscht werden soll."
msgid "strdomain"
msgstr "Domäne"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domänen"
msgid "strshowalldomains"
diff --git a/locale/el_GR/LC_MESSAGES/messages.mo b/locale/el_GR/LC_MESSAGES/messages.mo
index bbc9985a0..e5dfc3d39 100644
Binary files a/locale/el_GR/LC_MESSAGES/messages.mo and b/locale/el_GR/LC_MESSAGES/messages.mo differ
diff --git a/locale/el_GR/LC_MESSAGES/messages.po b/locale/el_GR/LC_MESSAGES/messages.po
index 43b4f3397..18ec55588 100644
--- a/locale/el_GR/LC_MESSAGES/messages.po
+++ b/locale/el_GR/LC_MESSAGES/messages.po
@@ -152,7 +152,7 @@ msgstr "Ενεργοποίηση Αυτόματης Συμπλήρωσης (Auto
msgid "strsave"
msgstr "Αποθήκευση"
-msgid "strreset"
+msgid "Reset"
msgstr "Καθαρισμός"
msgid "strinsert"
@@ -188,7 +188,7 @@ msgstr "Προσαρμογή"
msgid "strcolumn"
msgstr "Στήλη"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Στήλες"
msgid "strrows"
@@ -347,10 +347,10 @@ msgstr "Επεξεργασία SQL"
msgid "strruntime"
msgstr "Συνολικός χρόνος εκτέλεσης: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Σελιδοποίηση"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "ή ανεβάστε σενάριο (script) SQL:"
msgid "strstarttime"
@@ -452,7 +452,7 @@ msgstr "Η αποτύπωση (dumping) περίπλοκων πινάκων κα
msgid "strtable"
msgstr "Πίνακας"
-msgid "strtables"
+msgid "Tables"
msgstr "Πίνακες"
msgid "strshowalltables"
@@ -917,7 +917,7 @@ msgstr "Το σήμα εστάλη."
msgid "strsignalsentbad"
msgstr "Η αποστολή του σήματος απέτυχε."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Ολα τα αντικείμενα"
msgid "strdatabasealtered"
@@ -930,7 +930,7 @@ msgstr "Η τροποποίηση της βάσης απέτυχε."
msgid "strview"
msgstr "Οψη"
-msgid "strviews"
+msgid "Views"
msgstr "Οψεις"
msgid "strshowallviews"
@@ -991,7 +991,7 @@ msgstr "Δημιουργία όψης με βοηθό"
msgid "strsequence"
msgstr "Ακολουθία"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Ακολουθίες"
msgid "strshowallsequences"
@@ -1085,7 +1085,7 @@ msgstr "Η προσαύξηση της ακολουθίας απέτυχε."
msgid "strindex"
msgstr "Ευρετήριο"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Ευρετήρια"
msgid "strindexname"
@@ -1161,7 +1161,7 @@ msgid "strcluster"
msgstr "Συστοιχία"
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Κανόνες"
msgid "strrule"
@@ -1204,7 +1204,7 @@ msgstr "Η διαγραφή του κανόνα απέτυχε."
msgid "strconstraint"
msgstr "Περιορισμός"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Περιορισμοί"
msgid "strshowallconstraints"
@@ -1298,7 +1298,7 @@ msgstr "ΚΑΤΑ ΤΗΝ ΕΝΗΜΕΡΩΣΗ"
msgid "strfunction"
msgstr "Συνάρτηση"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Συναρτήσεις"
msgid "strshowallfunctions"
@@ -1398,10 +1398,10 @@ msgid "strargremoveconfirm"
msgstr "Να διαγραφεί το όρισμα; Η ενέργεια είναι ΜΗ ΑΝΑΣΤΡΕΨΙΜΗ."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Εναυσμα"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Εναύσματα"
msgid "strshowalltriggers"
@@ -1556,7 +1556,7 @@ msgstr "Ψεύδο"
msgid "strschema"
msgstr "Σχήμα"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Σχήματα"
msgid "strshowallschemas"
@@ -1598,7 +1598,7 @@ msgstr "Το σχήμα τροποποιήθηκε."
msgid "strschemaalteredbad"
msgstr "Η τροποποίηση του σχήματος απέτυχε."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Πορεία αναζήτησης σχήματος"
# Reports
@@ -1607,7 +1607,7 @@ msgstr "Πορεία αναζήτησης σχήματος"
msgid "strdomain"
msgstr "Τομέας"
-msgid "strdomains"
+msgid "Domains"
msgstr "Τομείς"
msgid "strshowalldomains"
diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo
index 8c2a19d23..cdd9b2bb7 100644
Binary files a/locale/en_US/LC_MESSAGES/messages.mo and b/locale/en_US/LC_MESSAGES/messages.mo differ
diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po
index 4092b8c9e..7a716f102 100644
--- a/locale/en_US/LC_MESSAGES/messages.po
+++ b/locale/en_US/LC_MESSAGES/messages.po
@@ -184,7 +184,8 @@ msgstr "Enable AutoComplete"
msgid "strsave"
msgstr "Save"
-msgid "strreset"
+# original: "strreset"
+msgid "Reset"
msgstr "Reset"
msgid "strrestart"
@@ -226,7 +227,8 @@ msgstr "Edit"
msgid "strcolumn"
msgstr "Column"
-msgid "strcolumns"
+# original: "strcolumns"
+msgid "Columns"
msgstr "Columns"
msgid "strrows"
@@ -399,10 +401,12 @@ msgstr "Edit SQL"
msgid "strruntime"
msgstr "Total runtime: %s ms"
-msgid "strpaginate"
+# original: "strpaginate"
+msgid "Paginate results"
msgstr "Paginate results"
-msgid "struploadscript"
+# original: "struploadscript"
+msgid "or upload an SQL script:"
msgstr "or upload an SQL script:"
msgid "strstarttime"
@@ -607,7 +611,8 @@ msgstr "Can not connect to server."
msgid "strtable"
msgstr "Table"
-msgid "strtables"
+# original: "strtables"
+msgid "Tables"
msgstr "Tables"
msgid "strshowalltables"
@@ -1150,7 +1155,8 @@ msgstr "Signal sent."
msgid "strsignalsentbad"
msgstr "Sending signal failed."
-msgid "strallobjects"
+# original: "strallobjects"
+msgid "All objects"
msgstr "All objects"
msgid "strdatabasealtered"
@@ -1183,7 +1189,8 @@ msgstr "Are you sure you want to cluster all tables in database \"%s\"?"
msgid "strview"
msgstr "View"
-msgid "strviews"
+# original: "strviews"
+msgid "Views"
msgstr "Views"
msgid "strshowallviews"
@@ -1262,7 +1269,8 @@ msgstr "You must specify at least one view to drop."
msgid "strsequence"
msgstr "Sequence"
-msgid "strsequences"
+# original: "strsequences"
+msgid "Sequences"
msgstr "Sequences"
msgid "strshowallsequences"
@@ -1368,7 +1376,8 @@ msgstr "You must specify at least one sequence to drop."
msgid "strindex"
msgstr "Index"
-msgid "strindexes"
+# original: "strindexes"
+msgid "Indexes"
msgstr "Indexes"
msgid "strindexname"
@@ -1447,7 +1456,8 @@ msgid "strnoclusteravailable"
msgstr "Table not clustered on an index."
# Rules
-msgid "strrules"
+# original: "strrules"
+msgid "Rules"
msgstr "Rules"
msgid "strrule"
@@ -1490,7 +1500,8 @@ msgstr "Rule drop failed."
msgid "strconstraint"
msgstr "Constraint"
-msgid "strconstraints"
+# original: "strconstraints"
+msgid "Constraints"
msgstr "Constraints"
msgid "strshowallconstraints"
@@ -1584,7 +1595,8 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Function"
-msgid "strfunctions"
+# original: "strfunctions"
+msgid "Functions"
msgstr "Functions"
msgid "strshowallfunctions"
@@ -1696,10 +1708,12 @@ msgid "strspecifyfunctiontodrop"
msgstr "You must specify at least one function to drop."
# Triggers
-msgid "strtrigger"
+# original: "strtrigger"
+msgid "Trigger"
msgstr "Trigger"
-msgid "strtriggers"
+# original: "strtriggers"
+msgid "Triggers"
msgstr "Triggers"
msgid "strshowalltriggers"
@@ -1872,7 +1886,8 @@ msgstr "Enum values"
msgid "strschema"
msgstr "Schema"
-msgid "strschemas"
+# original: "strschemas"
+msgid "Schemas"
msgstr "Schemas"
msgid "strshowallschemas"
@@ -1914,7 +1929,8 @@ msgstr "Schema altered."
msgid "strschemaalteredbad"
msgstr "Schema alteration failed."
-msgid "strsearchpath"
+# original: "strsearchpath"
+msgid "Schema search path"
msgstr "Schema search path"
msgid "strspecifyschematodrop"
@@ -1926,7 +1942,8 @@ msgstr "You must specify at least one schema to drop."
msgid "strdomain"
msgstr "Domain"
-msgid "strdomains"
+# original: "strdomains"
+msgid "Domains"
msgstr "Domains"
msgid "strshowalldomains"
diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 249e77f5d..cfed48a5d 100644
Binary files a/locale/es_ES/LC_MESSAGES/messages.mo and b/locale/es_ES/LC_MESSAGES/messages.mo differ
diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index 0d2e6cf35..dae9456cd 100644
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -164,7 +164,7 @@ msgstr "Activar AutoCompletado"
msgid "strsave"
msgstr "Guardar"
-msgid "strreset"
+msgid "Reset"
msgstr "Reestablecer"
msgid "strrestart"
@@ -203,7 +203,7 @@ msgstr "Editar"
msgid "strcolumn"
msgstr "Columna"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Columnas"
msgid "strrows"
@@ -365,10 +365,10 @@ msgstr "Editar SQL"
msgid "strruntime"
msgstr "Tiempo total de ejecución: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Paginar resultados"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "o subir un script SQL:"
msgid "strstarttime"
@@ -556,7 +556,7 @@ msgstr "No se puede conectar al servidor."
msgid "strtable"
msgstr "Tabla"
-msgid "strtables"
+msgid "Tables"
msgstr "Tablas"
msgid "strshowalltables"
@@ -1084,7 +1084,7 @@ msgstr "Señal enviada."
msgid "strsignalsentbad"
msgstr "Falló el envío de la señal."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Todos los objetos"
msgid "strdatabasealtered"
@@ -1115,7 +1115,7 @@ msgstr "¿Estás seguro que desea ordenar todas las tablas en la base de datos
msgid "strview"
msgstr "Vista"
-msgid "strviews"
+msgid "Views"
msgstr "Vistas"
msgid "strshowallviews"
@@ -1194,7 +1194,7 @@ msgstr "Debes especificar al menos una vista a eliminar."
msgid "strsequence"
msgstr "Secuencia"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Secuencias"
msgid "strshowallsequences"
@@ -1300,7 +1300,7 @@ msgstr "Debes especificar al menos una secuencia a eliminar."
msgid "strindex"
msgstr "Índice"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Índices"
msgid "strindexname"
@@ -1379,7 +1379,7 @@ msgid "strnoclusteravailable"
msgstr "Tabla no ordenada en un índice."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Reglas"
msgid "strrule"
@@ -1422,7 +1422,7 @@ msgstr "Falló la eliminación de la regla."
msgid "strconstraint"
msgstr "Restricción"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Restricciones"
msgid "strshowallconstraints"
@@ -1516,7 +1516,7 @@ msgstr "AL ACTUALIZAR"
msgid "strfunction"
msgstr "Función"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funciones"
msgid "strshowallfunctions"
@@ -1628,10 +1628,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "Debes especificar al menos una función a eliminar."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Disparador"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Disparadores"
msgid "strshowalltriggers"
@@ -1804,7 +1804,7 @@ msgstr "Valores enumerados"
msgid "strschema"
msgstr "Esquema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Esquemas"
msgid "strshowallschemas"
@@ -1846,7 +1846,7 @@ msgstr "Esquema actualizado."
msgid "strschemaalteredbad"
msgstr "Falló la actualización del esquema."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Ruta de la búsqueda en los esquemas"
msgid "strspecifyschematodrop"
@@ -1858,7 +1858,7 @@ msgstr "Debes especificar al menos un esquema a eliminar."
msgid "strdomain"
msgstr "Dominio"
-msgid "strdomains"
+msgid "Domains"
msgstr "Dominios"
msgid "strshowalldomains"
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 764f0959e..3f56c1f08 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 51a09a70a..4a459e2c4 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -164,7 +164,7 @@ msgstr "Activer la complétion automatique"
msgid "strsave"
msgstr "Sauvegarder"
-msgid "strreset"
+msgid "Reset"
msgstr "Réinitialiser"
msgid "strrestart"
@@ -203,7 +203,7 @@ msgstr "Éditer"
msgid "strcolumn"
msgstr "Colonne"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Colonnes"
msgid "strrows"
@@ -365,10 +365,10 @@ msgstr "Éditer SQL"
msgid "strruntime"
msgstr "Temps d'exécution total : %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Paginer les résultats"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "ou importer un script SQL :"
msgid "strstarttime"
@@ -562,7 +562,7 @@ msgstr "Connexion au serveur échouée."
msgid "strtable"
msgstr "Table"
-msgid "strtables"
+msgid "Tables"
msgstr "Tables"
msgid "strshowalltables"
@@ -1090,7 +1090,7 @@ msgstr "Signal envoyé."
msgid "strsignalsentbad"
msgstr "Échec lors de l'envoi du signal."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Tous les objets"
msgid "strdatabasealtered"
@@ -1121,7 +1121,7 @@ msgstr "Êtes vous sûr de vouloir éffectuer un CLUSTER sur toutes les tables d
msgid "strview"
msgstr "Vue"
-msgid "strviews"
+msgid "Views"
msgstr "Vues"
msgid "strshowallviews"
@@ -1200,7 +1200,7 @@ msgstr "Vous devez spécifier au moins une vue à supprimer."
msgid "strsequence"
msgstr "Séquence"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Séquences"
msgid "strshowallsequences"
@@ -1306,7 +1306,7 @@ msgstr "Vous devez spécifier au moins une séquence à supprimer."
msgid "strindex"
msgstr "Index"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Index"
msgid "strindexname"
@@ -1385,7 +1385,7 @@ msgid "strnoclusteravailable"
msgstr "La table n'est pas encore ordonnée selon un index."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Règles"
msgid "strrule"
@@ -1428,7 +1428,7 @@ msgstr "Échec lors de la suppression de la règle."
msgid "strconstraint"
msgstr "Contrainte"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Contraintes"
msgid "strshowallconstraints"
@@ -1522,7 +1522,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Fonction"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Fonctions"
msgid "strshowallfunctions"
@@ -1634,10 +1634,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "Vous devez spécifier au moins une fonction à supprimer."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Trigger"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Triggers"
msgid "strshowalltriggers"
@@ -1810,7 +1810,7 @@ msgstr "Valeurs de l'enum"
msgid "strschema"
msgstr "Schéma"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Schémas"
msgid "strshowallschemas"
@@ -1852,7 +1852,7 @@ msgstr "Schema modifié."
msgid "strschemaalteredbad"
msgstr "Échec lors de la modification du schéma."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Chemin de recherche du schéma"
msgid "strspecifyschematodrop"
@@ -1864,7 +1864,7 @@ msgstr "Vous devez spécifier au moins un schéma à supprimer."
msgid "strdomain"
msgstr "Domaine"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domaines"
msgid "strshowalldomains"
diff --git a/locale/gl_ES/LC_MESSAGES/messages.mo b/locale/gl_ES/LC_MESSAGES/messages.mo
index 60582a0db..eeb935a0e 100644
Binary files a/locale/gl_ES/LC_MESSAGES/messages.mo and b/locale/gl_ES/LC_MESSAGES/messages.mo differ
diff --git a/locale/gl_ES/LC_MESSAGES/messages.po b/locale/gl_ES/LC_MESSAGES/messages.po
index 7e6a597ba..79c1135e7 100644
--- a/locale/gl_ES/LC_MESSAGES/messages.po
+++ b/locale/gl_ES/LC_MESSAGES/messages.po
@@ -164,7 +164,7 @@ msgstr "Activar o completado automático"
msgid "strsave"
msgstr "Gardar"
-msgid "strreset"
+msgid "Reset"
msgstr "Restablecer"
msgid "strrestart"
@@ -203,7 +203,7 @@ msgstr "Editar"
msgid "strcolumn"
msgstr "Columna"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Columnas"
msgid "strrows"
@@ -362,10 +362,10 @@ msgstr "Editar SQL"
msgid "strruntime"
msgstr "Tempo total funcionando: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Amosar os resultados por páxinas"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "ou cargue un guión en SQL:"
msgid "strstarttime"
@@ -553,7 +553,7 @@ msgstr "Non se puido establecer a conexión co servidor."
msgid "strtable"
msgstr "Táboa"
-msgid "strtables"
+msgid "Tables"
msgstr "Táboas"
msgid "strshowalltables"
@@ -1078,7 +1078,7 @@ msgstr "Enviouse o sinal."
msgid "strsignalsentbad"
msgstr "Non se conseguiu enviar o sinal."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Todos os obxectos"
msgid "strdatabasealtered"
@@ -1109,7 +1109,7 @@ msgstr "Está seguro de que quere concentrar todas as táboas da base de datos
msgid "strview"
msgstr "Vista"
-msgid "strviews"
+msgid "Views"
msgstr "Vistas"
msgid "strshowallviews"
@@ -1188,7 +1188,7 @@ msgstr "Debe especificar polo menos unha vista a borrar."
msgid "strsequence"
msgstr "Secuencia"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Secuencias"
msgid "strshowallsequences"
@@ -1294,7 +1294,7 @@ msgstr "Debe especificar polo menos unha secuencia a eliminar."
msgid "strindex"
msgstr "Índice"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Índices"
msgid "strindexname"
@@ -1373,7 +1373,7 @@ msgid "strnoclusteravailable"
msgstr "A táboa non está concentrada nun índice."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Regras"
msgid "strrule"
@@ -1416,7 +1416,7 @@ msgstr "Non se conseguiu eliminar a regra."
msgid "strconstraint"
msgstr "Restrición"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Restricións"
msgid "strshowallconstraints"
@@ -1512,7 +1512,7 @@ msgstr "AO BORRAR"
msgid "strfunction"
msgstr "Función"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funcións"
msgid "strshowallfunctions"
@@ -1624,10 +1624,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "Debe especificar polo menos unha función a eliminar."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Disparador"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Disparadores"
msgid "strshowalltriggers"
@@ -1801,7 +1801,7 @@ msgstr "Valores da enumeración"
msgid "strschema"
msgstr "Esquema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Esquemas"
msgid "strshowallschemas"
@@ -1843,7 +1843,7 @@ msgstr "Modificouse o esquema."
msgid "strschemaalteredbad"
msgstr "Non se conseguiu modificar o esquema."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Ruta de busca do esquema"
msgid "strspecifyschematodrop"
@@ -1855,7 +1855,7 @@ msgstr "Debe especificar polo menos un esquema a eliminar."
msgid "strdomain"
msgstr "Dominio"
-msgid "strdomains"
+msgid "Domains"
msgstr "Dominios"
msgid "strshowalldomains"
diff --git a/locale/he_IL/LC_MESSAGES/messages.mo b/locale/he_IL/LC_MESSAGES/messages.mo
index 450c28962..f923085c1 100644
Binary files a/locale/he_IL/LC_MESSAGES/messages.mo and b/locale/he_IL/LC_MESSAGES/messages.mo differ
diff --git a/locale/he_IL/LC_MESSAGES/messages.po b/locale/he_IL/LC_MESSAGES/messages.po
index 476026b3f..5bbe76355 100644
--- a/locale/he_IL/LC_MESSAGES/messages.po
+++ b/locale/he_IL/LC_MESSAGES/messages.po
@@ -134,7 +134,7 @@ msgstr "בטל"
msgid "strsave"
msgstr "שמור"
-msgid "strreset"
+msgid "Reset"
msgstr "שחזר"
msgid "strinsert"
@@ -167,7 +167,7 @@ msgstr "שקר"
msgid "stredit"
msgstr "ערוך"
-msgid "strcolumns"
+msgid "Columns"
msgstr "עמודות"
msgid "strrows"
@@ -329,10 +329,10 @@ msgstr "ערוך SQL"
msgid "strruntime"
msgstr "זמן-ריצה כולל: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Paginate results"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "או העלה תסריט SQL:"
msgid "strstarttime"
@@ -394,7 +394,7 @@ msgstr "שגיאת יבוא בשורה: %s."
msgid "strtable"
msgstr "טבלה"
-msgid "strtables"
+msgid "Tables"
msgstr "טבלאות"
msgid "strshowalltables"
@@ -791,14 +791,14 @@ msgstr "שלח אות."
msgid "strsignalsentbad"
msgstr "שליחת אות נכשלה."
-msgid "strallobjects"
+msgid "All objects"
msgstr "כל העצמים"
# Views
msgid "strview"
msgstr "צפייה"
-msgid "strviews"
+msgid "Views"
msgstr "צפיות"
msgid "strshowallviews"
@@ -859,7 +859,7 @@ msgstr "צור צפייה בעזרת אשף."
msgid "strsequence"
msgstr "נוסחה"
-msgid "strsequences"
+msgid "Sequences"
msgstr "נוסחאות"
msgid "strshowallsequences"
@@ -926,7 +926,7 @@ msgstr "איתחול נוסחה נכשלה."
msgid "strindex"
msgstr "אינדקס"
-msgid "strindexes"
+msgid "Indexes"
msgstr "אינדקסים"
msgid "strindexname"
@@ -999,7 +999,7 @@ msgid "strclusteredbad"
msgstr "אשכול נכשל."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "חוקים"
msgid "strrule"
@@ -1039,7 +1039,7 @@ msgid "strruledroppedbad"
msgstr "מחיקת חוק נכשלה."
# Constraints
-msgid "strconstraints"
+msgid "Constraints"
msgstr "מבנים"
msgid "strshowallconstraints"
@@ -1133,7 +1133,7 @@ msgstr "UPDATE ב"
msgid "strfunction"
msgstr "פונקציה"
-msgid "strfunctions"
+msgid "Functions"
msgstr "פונקציות"
msgid "strshowallfunctions"
@@ -1200,10 +1200,10 @@ msgid "strlinksymbol"
msgstr "קישור סימלי"
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "זרז"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "זרזים"
msgid "strshowalltriggers"
@@ -1334,7 +1334,7 @@ msgstr "פאסדו"
msgid "strschema"
msgstr "תרשים"
-msgid "strschemas"
+msgid "Schemas"
msgstr "תרשמים"
msgid "strshowallschemas"
@@ -1376,7 +1376,7 @@ msgstr "תרשים נערך."
msgid "strschemaalteredbad"
msgstr "עריכת תרשים נכשלה."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "חיפוש מיקום התרשים."
# Reports
@@ -1385,7 +1385,7 @@ msgstr "חיפוש מיקום התרשים."
msgid "strdomain"
msgstr "תחום"
-msgid "strdomains"
+msgid "Domains"
msgstr "תחומים"
msgid "strshowalldomains"
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 2d0fdd2ac..ec97c71dc 100644
Binary files a/locale/hu_HU/LC_MESSAGES/messages.mo and b/locale/hu_HU/LC_MESSAGES/messages.mo differ
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 0f93e63f5..cb6cfa640 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -164,7 +164,7 @@ msgstr "Önműködő kiegészítés engedélyezése"
msgid "strsave"
msgstr "Ment"
-msgid "strreset"
+msgid "Reset"
msgstr "Újra"
msgid "strrestart"
@@ -203,7 +203,7 @@ msgstr "Szerkeszt"
msgid "strcolumn"
msgstr "Oszlop"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Oszlopok"
msgid "strrows"
@@ -362,10 +362,10 @@ msgstr "SQL-szerkesztés"
msgid "strruntime"
msgstr "Teljes futási idő: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Oldalakra tördelés"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "vagy egy SQL-írás feltöltése:"
msgid "strstarttime"
@@ -553,7 +553,7 @@ msgstr "Nem csatlakozhatok a szolgálóhoz."
msgid "strtable"
msgstr "Tábla"
-msgid "strtables"
+msgid "Tables"
msgstr "Táblák"
msgid "strshowalltables"
@@ -1078,7 +1078,7 @@ msgstr "Jelzés elküldve."
msgid "strsignalsentbad"
msgstr "Nem sikerült jelzést küldeni."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Minden objektum"
msgid "strdatabasealtered"
@@ -1109,7 +1109,7 @@ msgstr "Biztosan fürtözni akarja „%s” adatbázis minden tábláját?"
msgid "strview"
msgstr "Nézet"
-msgid "strviews"
+msgid "Views"
msgstr "Nézetek"
msgid "strshowallviews"
@@ -1188,7 +1188,7 @@ msgstr "Meg kell adni a törlendő nézetet"
msgid "strsequence"
msgstr "Sorozat"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sorozatok"
msgid "strshowallsequences"
@@ -1294,7 +1294,7 @@ msgstr "Meg kell adnia a törlendő sorozatot"
msgid "strindex"
msgstr "Index"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indexek"
msgid "strindexname"
@@ -1370,7 +1370,7 @@ msgid "strnoclusteravailable"
msgstr "A tábla nincs indexre fürtözve."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Szabályok"
msgid "strrule"
@@ -1413,7 +1413,7 @@ msgstr "Nem sikerült törölni a szabályt."
msgid "strconstraint"
msgstr "Megszorítás"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Megszorítások"
msgid "strshowallconstraints"
@@ -1507,7 +1507,7 @@ msgstr "VÁLTOZTATÁSKOR"
msgid "strfunction"
msgstr "Függvény"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Függvények"
msgid "strshowallfunctions"
@@ -1619,10 +1619,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "Legalább egy törlendő függvényt meg kell adni"
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Ravasz"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Ravaszok"
msgid "strshowalltriggers"
@@ -1795,7 +1795,7 @@ msgstr "Felsorolás értékei"
msgid "strschema"
msgstr "Séma"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Sémák"
msgid "strshowallschemas"
@@ -1837,7 +1837,7 @@ msgstr "Séma megváltoztatva."
msgid "strschemaalteredbad"
msgstr "Nem sikerült a sémát megváltoztatni."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Séma keresési útvonala"
msgid "strspecifyschematodrop"
@@ -1849,7 +1849,7 @@ msgstr "Meg kell adni a törlendő sémát"
msgid "strdomain"
msgstr "Tartomány"
-msgid "strdomains"
+msgid "Domains"
msgstr "Tartományok"
msgid "strshowalldomains"
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 817b452df..4b9f4a2d0 100644
Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index fa3eb1fd0..bb304a13a 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -155,7 +155,7 @@ msgstr "Abilita autocompletamento"
msgid "strsave"
msgstr "Salva"
-msgid "strreset"
+msgid "Reset"
msgstr "Reset"
msgid "strinsert"
@@ -191,7 +191,7 @@ msgstr "Modifica"
msgid "strcolumn"
msgstr "Colonna"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Colonne"
msgid "strrows"
@@ -356,10 +356,10 @@ msgstr "Modifica SQL"
msgid "strruntime"
msgstr "Tempo di esecuzione totale: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Dividi in pagine i risultati"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "oppure esegui l'upload di uno script SQL:"
msgid "strstarttime"
@@ -470,7 +470,7 @@ msgstr "Tentativo di connessione al server con parametri non validi, è possibil
msgid "strtable"
msgstr "Tabella"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabelle"
msgid "strshowalltables"
@@ -944,7 +944,7 @@ msgstr "Segnale inviato."
msgid "strsignalsentbad"
msgstr "Invio del segnale fallito."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Tutti gli oggetti"
msgid "strdatabasealtered"
@@ -957,7 +957,7 @@ msgstr "Modifica del database fallita."
msgid "strview"
msgstr "Vista"
-msgid "strviews"
+msgid "Views"
msgstr "Viste"
msgid "strshowallviews"
@@ -1018,7 +1018,7 @@ msgstr "Crea vista tramite wizard"
msgid "strsequence"
msgstr "Sequenza"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sequenze"
msgid "strshowallsequences"
@@ -1109,7 +1109,7 @@ msgstr "Incremento della sequenza fallito."
msgid "strindex"
msgstr "Indice"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indici"
msgid "strindexname"
@@ -1185,7 +1185,7 @@ msgid "strcluster"
msgstr "Cluster"
# Rules - Regole
-msgid "strrules"
+msgid "Rules"
msgstr "Regole"
msgid "strrule"
@@ -1228,7 +1228,7 @@ msgstr "Eliminazione della regola fallita."
msgid "strconstraint"
msgstr "Vincolo"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Vincoli"
msgid "strshowallconstraints"
@@ -1322,7 +1322,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Funzione"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funzioni"
msgid "strshowallfunctions"
@@ -1389,10 +1389,10 @@ msgid "strarguments"
msgstr "Argomenti"
# Triggers - Trigger
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Trigger"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Trigger"
msgid "strshowalltriggers"
@@ -1532,7 +1532,7 @@ msgstr "Pseudo-tipo"
msgid "strschema"
msgstr "Schema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Schemi"
msgid "strshowallschemas"
@@ -1574,7 +1574,7 @@ msgstr "Schema modificato."
msgid "strschemaalteredbad"
msgstr "Modifica dello schema fallita."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Ordine di ricerca dello schema"
# Reports - Rapporti
@@ -1583,7 +1583,7 @@ msgstr "Ordine di ricerca dello schema"
msgid "strdomain"
msgstr "Dominio"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domini"
msgid "strshowalldomains"
diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index d66e8cc5b..35ad7e2d1 100644
Binary files a/locale/ja_JP/LC_MESSAGES/messages.mo and b/locale/ja_JP/LC_MESSAGES/messages.mo differ
diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index cb88cdd5f..46cf4b46a 100644
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -155,7 +155,7 @@ msgstr "自動補完を有効にする"
msgid "strsave"
msgstr "保存"
-msgid "strreset"
+msgid "Reset"
msgstr "リセット"
msgid "strinsert"
@@ -191,7 +191,7 @@ msgstr "編集"
msgid "strcolumn"
msgstr "カラム"
-msgid "strcolumns"
+msgid "Columns"
msgstr "カラム"
msgid "strrows"
@@ -347,10 +347,10 @@ msgstr "SQL 編集"
msgid "strruntime"
msgstr "総実行時間: %s ミリ秒"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "結果のページ分割処理を行う"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "または SQL スクリプトをアップロード:"
msgid "strstarttime"
@@ -489,7 +489,7 @@ msgstr "サーバーが指定されていません!"
msgid "strtable"
msgstr "テーブル"
-msgid "strtables"
+msgid "Tables"
msgstr "テーブル"
msgid "strshowalltables"
@@ -996,7 +996,7 @@ msgstr "シグナル送信"
msgid "strsignalsentbad"
msgstr "シグナル送信に失敗しました"
-msgid "strallobjects"
+msgid "All objects"
msgstr "すべてのオブジェクト"
msgid "strdatabasealtered"
@@ -1012,7 +1012,7 @@ msgstr "データベースを破棄するには少なくとも 1 つ指定しな
msgid "strview"
msgstr "ビュー"
-msgid "strviews"
+msgid "Views"
msgstr "ビュー"
msgid "strshowallviews"
@@ -1091,7 +1091,7 @@ msgstr "ビューを破棄するには少なくとも 1 つ指定しなければ
msgid "strsequence"
msgstr "シーケンス"
-msgid "strsequences"
+msgid "Sequences"
msgstr "シーケンス"
msgid "strshowallsequences"
@@ -1188,7 +1188,7 @@ msgstr "シーケンスを破棄するには少なくとも 1 つ指定しなけ
msgid "strindex"
msgstr "インデックス"
-msgid "strindexes"
+msgid "Indexes"
msgstr "インデックス"
msgid "strindexname"
@@ -1264,7 +1264,7 @@ msgid "strcluster"
msgstr "クラスター"
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "ルール"
msgid "strrule"
@@ -1307,7 +1307,7 @@ msgstr "ルールの破棄に失敗しました。"
msgid "strconstraint"
msgstr "検査制約"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "検査制約"
msgid "strshowallconstraints"
@@ -1401,7 +1401,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "関数"
-msgid "strfunctions"
+msgid "Functions"
msgstr "関数"
msgid "strshowallfunctions"
@@ -1513,10 +1513,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "関数を破棄するには少なくとも 1 つ指定しなければなりません"
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "トリガー"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "トリガー"
msgid "strshowalltriggers"
@@ -1692,7 +1692,7 @@ msgstr "Enum Values"
msgid "strschema"
msgstr "スキーマ"
-msgid "strschemas"
+msgid "Schemas"
msgstr "スキーマ"
msgid "strshowallschemas"
@@ -1734,7 +1734,7 @@ msgstr "スキーマを変更しました。"
msgid "strschemaalteredbad"
msgstr "スキーマの変更に失敗しました。"
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "スキーマ検索パス"
msgid "strspecifyschematodrop"
@@ -1746,7 +1746,7 @@ msgstr "スキーマを破棄するには少なくとも 1 つ指定しなけれ
msgid "strdomain"
msgstr "ドメイン"
-msgid "strdomains"
+msgid "Domains"
msgstr "ドメイン"
msgid "strshowalldomains"
diff --git a/locale/lt_LT/LC_MESSAGES/messages.mo b/locale/lt_LT/LC_MESSAGES/messages.mo
index e2234218f..ab85584da 100644
Binary files a/locale/lt_LT/LC_MESSAGES/messages.mo and b/locale/lt_LT/LC_MESSAGES/messages.mo differ
diff --git a/locale/lt_LT/LC_MESSAGES/messages.po b/locale/lt_LT/LC_MESSAGES/messages.po
index 91a94bc4c..aca5f00b8 100644
--- a/locale/lt_LT/LC_MESSAGES/messages.po
+++ b/locale/lt_LT/LC_MESSAGES/messages.po
@@ -170,7 +170,7 @@ msgstr "Įjungti automatinį baigimą"
msgid "strsave"
msgstr "Įrašyti"
-msgid "strreset"
+msgid "Reset"
msgstr "Atstatyti į pradinę būseną"
# Atkurti
@@ -210,7 +210,7 @@ msgstr "Taisyti"
msgid "strcolumn"
msgstr "Stulpelis"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Stulpeliai"
msgid "strrows"
@@ -374,10 +374,10 @@ msgstr "Redaguoti SQL"
msgid "strruntime"
msgstr "Visa vykdymo trukmė: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Rezultatus skaidyti į puslapius"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "arba nusiųsti SQL skriptą:"
msgid "strstarttime"
@@ -568,7 +568,7 @@ msgstr "Nepavyksta prisijungti prie serverio."
msgid "strtable"
msgstr "Lentelė"
-msgid "strtables"
+msgid "Tables"
msgstr "Lentelės"
msgid "strshowalltables"
@@ -1097,7 +1097,7 @@ msgstr "Signalas išsiųstas."
msgid "strsignalsentbad"
msgstr "Nepavyko išsiųsti signalo."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Visi objektai"
msgid "strdatabasealtered"
@@ -1128,7 +1128,7 @@ msgstr "Ar tikrai norite sutvarkyti visas lenteles duomenų bazėje \"%s\"?"
msgid "strview"
msgstr "Rodinys"
-msgid "strviews"
+msgid "Views"
msgstr "Rodiniai"
msgid "strshowallviews"
@@ -1207,7 +1207,7 @@ msgstr "Turite nurodyti bent vieną rodinį, kurį norite pašalinti."
msgid "strsequence"
msgstr "Seka"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sekos"
msgid "strshowallsequences"
@@ -1314,7 +1314,7 @@ msgstr "Turite nurodyti bent vieną seką, kurią norite pašalinti."
msgid "strindex"
msgstr "Indeksas"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indeksai"
msgid "strindexname"
@@ -1394,7 +1394,7 @@ msgid "strnoclusteravailable"
msgstr "Lentelė nesutvarkyta pagal indeksą."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Taisyklės"
msgid "strrule"
@@ -1437,7 +1437,7 @@ msgstr "Nepavyko pašalinti taisyklės."
msgid "strconstraint"
msgstr "Ribojimas"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Ribojimai"
msgid "strshowallconstraints"
@@ -1531,7 +1531,7 @@ msgstr "atnaujinant"
msgid "strfunction"
msgstr "Funkcija"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funkcijos"
msgid "strshowallfunctions"
@@ -1643,10 +1643,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "Turite nurodyti bent vieną funkciją, kurią norite pašalinti."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Trigeris"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Trigeriai"
msgid "strshowalltriggers"
@@ -1819,7 +1819,7 @@ msgstr "Enum reikšmės"
msgid "strschema"
msgstr "Schema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Schemos"
msgid "strshowallschemas"
@@ -1861,7 +1861,7 @@ msgstr "Schema pakeista."
msgid "strschemaalteredbad"
msgstr "Nepavyko pakeisti schemos."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Schemų paieškos kelias"
msgid "strspecifyschematodrop"
@@ -1873,7 +1873,7 @@ msgstr "Turite nurodyti bent vieną schemą, kurią norite pašalinti."
msgid "strdomain"
msgstr "Domenas"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domenai"
msgid "strshowalldomains"
diff --git a/locale/mn_MN/LC_MESSAGES/messages.mo b/locale/mn_MN/LC_MESSAGES/messages.mo
index 434776cdb..1e08fd6df 100644
Binary files a/locale/mn_MN/LC_MESSAGES/messages.mo and b/locale/mn_MN/LC_MESSAGES/messages.mo differ
diff --git a/locale/mn_MN/LC_MESSAGES/messages.po b/locale/mn_MN/LC_MESSAGES/messages.po
index 3cab7f0c1..f80dc8775 100644
--- a/locale/mn_MN/LC_MESSAGES/messages.po
+++ b/locale/mn_MN/LC_MESSAGES/messages.po
@@ -137,7 +137,7 @@ msgstr "ш?оЩЮЧ?Ъ ТЯЬЧЯШ"
msgid "strsave"
msgstr "шСФЧСЬСШ"
-msgid "strreset"
+msgid "Reset"
msgstr "свЩЬЧСШ"
msgid "strinsert"
@@ -170,7 +170,7 @@ msgstr "шеФСЬ"
msgid "stredit"
msgstr "њСгСШ"
-msgid "strcolumns"
+msgid "Columns"
msgstr "тСЧСЮС"
msgid "strrows"
@@ -337,7 +337,7 @@ msgstr "юХд еЮЩЫСЬиЮЯЧЯ ЩФХЮдЩЦЩЫСдЯвС ФЬб мдЯ
msgid "strtable"
msgstr "єСТЬЩУС"
-msgid "strtables"
+msgid "Tables"
msgstr "єСТЬЩУй"
msgid "strshowalltables"
@@ -714,7 +714,7 @@ msgstr " яаХвСУЩб СЮСЬЩкС кСзХвлХЮС."
msgid "strview"
msgstr "№вХФгдСзЬХЮЩХ"
-msgid "strviews"
+msgid "Views"
msgstr "№вХФгдСзЬХЮЩб"
msgid "strshowallviews"
@@ -763,7 +763,7 @@ msgstr "яТЮЯзЬХЮЩХ авХФгдСзЬХЮЩб авХвзСЮЯ."
msgid "strsequence"
msgstr "№ЯгЬХФЯзСдХЬиЮЯгди"
-msgid "strsequences"
+msgid "Sequences"
msgstr " №ЯгЬХФЯзСдХЬиЮЯгдЩ"
msgid "strshowallsequences"
@@ -827,7 +827,7 @@ msgid "strsequenceresetbad"
msgstr "ѓТвЯг аЯгЬХФЯзСдХЬиЮЯгдЩ авХвзСЮ."
# Indexes
-msgid "strindexes"
+msgid "Indexes"
msgstr "щЮФХЫг"
msgid "strshowallindexes"
@@ -900,7 +900,7 @@ msgid "strclusteredbad"
msgstr "ыЬСгдХвЩкСУЩб авХвзСЮС."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "№вСзЩЬС"
msgid "strrule"
@@ -940,7 +940,7 @@ msgid "strruledroppedbad"
msgstr "ѕЮЩодЯжХЮЩХ авСзЩЬС авХвзСЮЯ."
# Constraints
-msgid "strconstraints"
+msgid "Constraints"
msgstr "яЧвСЮЩоХЮЩб"
msgid "strshowallconstraints"
@@ -1034,7 +1034,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "цеЮЫУЩб"
-msgid "strfunctions"
+msgid "Functions"
msgstr " цеЮЫУЩЩ"
msgid "strshowallfunctions"
@@ -1089,10 +1089,10 @@ msgid "strfunctionupdatedbad"
msgstr "яТЮЯзЬХЮЩХ ЦеЮЫУЩЩ авХвзСЮЯ."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "євЩЧЧХв"
-msgid "strtriggers"
+msgid "Triggers"
msgstr " євЩЧЧХвй"
msgid "strshowalltriggers"
@@ -1202,7 +1202,7 @@ msgstr "ѕЮЩодЯжХЮЩХ дЩаС ФСЮЮйШ авХвзСЮЯ."
msgid "strschema"
msgstr "ѓШХЭС"
-msgid "strschemas"
+msgid "Schemas"
msgstr "ѓШХЭй"
msgid "strshowallschemas"
@@ -1244,7 +1244,7 @@ msgstr "ѕЮЩодЯжХЮЩХ гШХЭй авХвзСЮЯ."
msgid "strdomain"
msgstr "фЯЭХЮ"
-msgid "strdomains"
+msgid "Domains"
msgstr "фЯЭХЮй"
msgid "strshowalldomains"
diff --git a/locale/nl_NL/LC_MESSAGES/messages.mo b/locale/nl_NL/LC_MESSAGES/messages.mo
index c29caa79c..ad51445fe 100644
Binary files a/locale/nl_NL/LC_MESSAGES/messages.mo and b/locale/nl_NL/LC_MESSAGES/messages.mo differ
diff --git a/locale/nl_NL/LC_MESSAGES/messages.po b/locale/nl_NL/LC_MESSAGES/messages.po
index 48a38c011..1f99915c4 100644
--- a/locale/nl_NL/LC_MESSAGES/messages.po
+++ b/locale/nl_NL/LC_MESSAGES/messages.po
@@ -68,31 +68,31 @@ msgstr "Naam"
msgid "strtable"
msgstr "Tabel"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabellen"
msgid "strview"
msgstr "View"
-msgid "strviews"
+msgid "Views"
msgstr "Views"
msgid "strdefinition"
msgstr "Definitie"
-msgid "strrules"
+msgid "Rules"
msgstr "Regels"
msgid "strsequence"
msgstr "Sequence"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sequences"
msgid "strfunction"
msgstr "Functie"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Functies"
msgid "stroperators"
@@ -177,7 +177,7 @@ msgstr "Regel"
msgid "strreferences"
msgstr "Referenties"
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Triggers"
msgid "stryes"
@@ -293,7 +293,7 @@ msgstr "log_cnt"
msgid "striscycled"
msgstr "is_cyclisch"
-msgid "strreset"
+msgid "Reset"
msgstr "Reset"
# Indicies
@@ -349,10 +349,10 @@ msgstr "U dient uw tabel een geldig aantal kolommen te geven."
msgid "Export"
msgstr "exporteer"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "constraints"
-msgid "strcolumns"
+msgid "Columns"
msgstr "kolommen"
# Functions
@@ -372,7 +372,7 @@ msgid "strfunctionneedsdef"
msgstr "U dient uw functie te definiëren."
# Triggers
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Triggers"
msgid "strnotriggers"
@@ -857,7 +857,7 @@ msgstr "Sequence verwijderd."
msgid "strsequencedroppedbad"
msgstr "Verwijdering van de sequence mislukt."
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indices"
msgid "strshowallindexes"
@@ -1085,7 +1085,7 @@ msgstr "Type naam"
msgid "strschema"
msgstr "Schema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Schema's"
msgid "strshowallschemas"
@@ -1219,7 +1219,7 @@ msgstr "Trigger wijziging mislukt."
msgid "strdomain"
msgstr "Domein"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domeinen"
msgid "strshowalldomains"
diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo
index ef2740554..716c51281 100644
Binary files a/locale/pl_PL/LC_MESSAGES/messages.mo and b/locale/pl_PL/LC_MESSAGES/messages.mo differ
diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po
index b335aff5a..443569d82 100644
--- a/locale/pl_PL/LC_MESSAGES/messages.po
+++ b/locale/pl_PL/LC_MESSAGES/messages.po
@@ -152,7 +152,7 @@ msgstr "Włącz autouzupełnianie"
msgid "strsave"
msgstr "Zapisz"
-msgid "strreset"
+msgid "Reset"
msgstr "Wyczyść"
msgid "strinsert"
@@ -188,7 +188,7 @@ msgstr "Edycja"
msgid "strcolumn"
msgstr "Kolumna"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Kolumny"
msgid "strrows"
@@ -359,10 +359,10 @@ msgstr "Edycja zapytania SQL"
msgid "strruntime"
msgstr "Całkowity czas pracy: %s ms."
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Wyświetl wyniki stronami"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "lub załaduj skrypt SQL:"
msgid "strstarttime"
@@ -464,7 +464,7 @@ msgstr "Zrzucanie złożonych nazw tabel i schematów pod Windows jest nie wspie
msgid "strtable"
msgstr "Tabela"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabele"
msgid "strshowalltables"
@@ -905,7 +905,7 @@ msgstr "Sygnał został wysłany."
msgid "strsignalsentbad"
msgstr "Próba wysłania sygnału się nie powiodła."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Wszystkie obiekty"
msgid "strdatabasealtered"
@@ -918,7 +918,7 @@ msgstr "Próba modyfikacji bazy danych się nie powiodła."
msgid "strview"
msgstr "Widok"
-msgid "strviews"
+msgid "Views"
msgstr "Widoki"
msgid "strshowallviews"
@@ -979,7 +979,7 @@ msgstr "Utwórz widok przy użyciu kreatora widoków"
msgid "strsequence"
msgstr "Sekwencja"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sekwencje"
msgid "strshowallsequences"
@@ -1073,7 +1073,7 @@ msgstr "Próba zwiększenia wartości sekwencji się nie powiodła."
msgid "strindex"
msgstr "Indeks"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indeksy"
msgid "strindexname"
@@ -1149,7 +1149,7 @@ msgid "strcluster"
msgstr "Klaster"
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Reguły"
msgid "strrule"
@@ -1192,7 +1192,7 @@ msgstr "Próba usunięcia reguły się nie powiodła."
msgid "strconstraint"
msgstr "Więz integralności"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Więzy integralności"
msgid "strshowallconstraints"
@@ -1286,7 +1286,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Funkcja"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funkcje"
msgid "strshowallfunctions"
@@ -1389,10 +1389,10 @@ msgid "strargremoveconfirm"
msgstr "Czy na pewno chcesz usunąć ten argument? Tej operacji nie będzie można cofnąć."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Procedura wyzwalana"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Procedury wyzwalane"
msgid "strshowalltriggers"
@@ -1550,7 +1550,7 @@ msgstr "pseudo"
msgid "strschema"
msgstr "Schemat"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Schematy"
msgid "strshowallschemas"
@@ -1592,7 +1592,7 @@ msgstr "Schemat został zmieniony."
msgid "strschemaalteredbad"
msgstr "Próba zmiany schematu się nie powiodła."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Ścieżka wyszukiwania schematu"
# Reports
@@ -1601,7 +1601,7 @@ msgstr "Ścieżka wyszukiwania schematu"
msgid "strdomain"
msgstr "Domena"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domeny"
msgid "strshowalldomains"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 76a2b3fdc..c96b0bb2b 100644
Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index bebe15d5c..9e85fc7fe 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -164,7 +164,7 @@ msgstr "Habilitar AutoComplete"
msgid "strsave"
msgstr "Salvar"
-msgid "strreset"
+msgid "Reset"
msgstr "Reiniciar"
msgid "strrestart"
@@ -203,7 +203,7 @@ msgstr "Editar"
msgid "strcolumn"
msgstr "Coluna"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Colunas"
msgid "strrows"
@@ -362,10 +362,10 @@ msgstr "Editar SQL"
msgid "strruntime"
msgstr "Tempo de execução total: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Paginar resultados"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "ou carregue o script SQL de um arquivo:"
msgid "strstarttime"
@@ -550,7 +550,7 @@ msgstr "A conexão falhou."
msgid "strtable"
msgstr "Tabela"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabelas"
msgid "strshowalltables"
@@ -1075,7 +1075,7 @@ msgstr "Sinal enviado."
msgid "strsignalsentbad"
msgstr "Falha ao enviar o sinal."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Todos os objetos"
msgid "strdatabasealtered"
@@ -1106,7 +1106,7 @@ msgstr "Você têm certeza que deseja clusterizar todas as tabelas na base de da
msgid "strview"
msgstr "Visão"
-msgid "strviews"
+msgid "Views"
msgstr "Visões"
msgid "strshowallviews"
@@ -1185,7 +1185,7 @@ msgstr "Você deve informar ao menos uma visão para deletar."
msgid "strsequence"
msgstr "Seqüência"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Seqüências"
msgid "strshowallsequences"
@@ -1291,7 +1291,7 @@ msgstr "Você deve informar ao menos uma seqüência para deletar."
msgid "strindex"
msgstr "Índice"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Índices"
msgid "strindexname"
@@ -1373,7 +1373,7 @@ msgid "strnoclusteravailable"
msgstr "Tabela não clusterizada em um índice."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Regras"
msgid "strrule"
@@ -1416,7 +1416,7 @@ msgstr "Falha ao deletar a regra."
msgid "strconstraint"
msgstr "Restrição"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Restrições"
msgid "strshowallconstraints"
@@ -1510,7 +1510,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Função"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funções"
msgid "strshowallfunctions"
@@ -1622,10 +1622,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "Você deve informar ao menos uma função para deletar."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Gatilho"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Gatilhos"
msgid "strshowalltriggers"
@@ -1798,7 +1798,7 @@ msgstr "Valores enum"
msgid "strschema"
msgstr "Esquema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Esquemas"
msgid "strshowallschemas"
@@ -1840,7 +1840,7 @@ msgstr "Esquema alterado."
msgid "strschemaalteredbad"
msgstr "Falha ao alterar o esquema."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Diretório de pesquisa do esquema"
msgid "strspecifyschematodrop"
@@ -1852,7 +1852,7 @@ msgstr "Você deve informar ao menos um esquema para deletar."
msgid "strdomain"
msgstr "Domínio"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domínios"
msgid "strshowalldomains"
diff --git a/locale/pt_PT/LC_MESSAGES/messages.mo b/locale/pt_PT/LC_MESSAGES/messages.mo
index ab1e958fe..e7317de19 100644
Binary files a/locale/pt_PT/LC_MESSAGES/messages.mo and b/locale/pt_PT/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_PT/LC_MESSAGES/messages.po b/locale/pt_PT/LC_MESSAGES/messages.po
index fa9e3c839..c71051550 100644
--- a/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/locale/pt_PT/LC_MESSAGES/messages.po
@@ -127,7 +127,7 @@ msgstr "Cancelar"
msgid "strsave"
msgstr "Gravar"
-msgid "strreset"
+msgid "Reset"
msgstr "Reiniciar"
msgid "strinsert"
@@ -154,7 +154,7 @@ msgstr "Não"
msgid "stredit"
msgstr "Editar"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Colunas"
msgid "strrows"
@@ -300,7 +300,7 @@ msgstr "A conexão falhou."
msgid "strtable"
msgstr "Tabela"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabelas"
msgid "strshowalltables"
@@ -614,7 +614,7 @@ msgstr "Falha ao executar análize."
msgid "strview"
msgstr "Visualização"
-msgid "strviews"
+msgid "Views"
msgstr "Visualizações"
msgid "strshowallviews"
@@ -663,7 +663,7 @@ msgstr "Falha ao alterar visualização."
msgid "strsequence"
msgstr "Sequência"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sequências"
msgid "strshowallsequences"
@@ -721,7 +721,7 @@ msgid "strsequencedroppedbad"
msgstr "Falha ao eliminar a sequência."
# Indexes
-msgid "strindexes"
+msgid "Indexes"
msgstr "Índices"
msgid "strshowallindexes"
@@ -785,7 +785,7 @@ msgid "strindexcolumnlist"
msgstr "Colunas no índice"
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Regras"
msgid "strrule"
@@ -825,7 +825,7 @@ msgid "strruledroppedbad"
msgstr "Falha ao eliminar a regra."
# Constraints
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Restrição"
msgid "strshowallconstraints"
@@ -919,7 +919,7 @@ msgstr "ALTERAR ACTIVO"
msgid "strfunction"
msgstr "Função"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funções"
msgid "strshowallfunctions"
@@ -971,10 +971,10 @@ msgid "strfunctionupdatedbad"
msgstr "Falha na actualização da função."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Gatilho"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Gatilhos"
msgid "strshowalltriggers"
@@ -1078,7 +1078,7 @@ msgstr "Eliminação de tipo falhou."
msgid "strschema"
msgstr "Esquema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Esquemas"
msgid "strshowallschemas"
@@ -1202,10 +1202,10 @@ msgstr "Editar SQL"
msgid "strruntime"
msgstr "Tempo total decorrido: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Paginar resultados"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "ou upload um script SQL:"
msgid "strstarttime"
@@ -1337,7 +1337,7 @@ msgstr "Sinal enviado."
msgid "strsignalsentbad"
msgstr "Falha ao enviar sinal."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Todos os objectos"
msgid "strviewneedsfields"
@@ -1418,13 +1418,13 @@ msgstr "Esquema Alterado."
msgid "strschemaalteredbad"
msgstr "Falha ao alterar o esquema."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Caminho de pesquisa no esquema"
msgid "strdomain"
msgstr "Domínio"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domínios"
msgid "strshowalldomains"
diff --git a/locale/ro_RO/LC_MESSAGES/messages.mo b/locale/ro_RO/LC_MESSAGES/messages.mo
index c38025d7c..59e8c23b2 100644
Binary files a/locale/ro_RO/LC_MESSAGES/messages.mo and b/locale/ro_RO/LC_MESSAGES/messages.mo differ
diff --git a/locale/ro_RO/LC_MESSAGES/messages.po b/locale/ro_RO/LC_MESSAGES/messages.po
index 43d0c1b7b..828bf019d 100644
--- a/locale/ro_RO/LC_MESSAGES/messages.po
+++ b/locale/ro_RO/LC_MESSAGES/messages.po
@@ -155,7 +155,7 @@ msgstr "Activare Auto-completare"
msgid "strsave"
msgstr "Salvare"
-msgid "strreset"
+msgid "Reset"
msgstr "Reiniţializare"
msgid "strinsert"
@@ -191,7 +191,7 @@ msgstr "Editare"
msgid "strcolumn"
msgstr "Coloană"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Coloane"
msgid "strrows"
@@ -356,10 +356,10 @@ msgstr "Editare SQL"
msgid "strruntime"
msgstr "Timp total de rulare:%s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Paginare rezultate"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "sau încărcare script SQL:"
msgid "strstarttime"
@@ -461,7 +461,7 @@ msgstr "Descărcarea de tabele complexe şi nume de scheme în Windows nu este s
msgid "strtable"
msgstr "Tabelă"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabele"
msgid "strshowalltables"
@@ -938,7 +938,7 @@ msgstr "Semnal trimis."
msgid "strsignalsentbad"
msgstr "Trimitere semnal eşuată."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Toate obiectele"
msgid "strdatabasealtered"
@@ -951,7 +951,7 @@ msgstr "Modificarea bazei de date a eşuat."
msgid "strview"
msgstr "Vizualizare"
-msgid "strviews"
+msgid "Views"
msgstr "Vizualizări"
msgid "strshowallviews"
@@ -1012,7 +1012,7 @@ msgstr "Creare vizualizare folosind expertul"
msgid "strsequence"
msgstr "Secvenţă"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Secvenţe"
msgid "strshowallsequences"
@@ -1106,7 +1106,7 @@ msgstr "Incremetare secvenţă eşuată"
msgid "strindex"
msgstr "Index"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indexuri"
msgid "strindexname"
@@ -1182,7 +1182,7 @@ msgid "strcluster"
msgstr "Grupare"
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Reguli"
msgid "strrule"
@@ -1225,7 +1225,7 @@ msgstr "Ştergere regulă eşuată."
msgid "strconstraint"
msgstr "Restricţie"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Restricţii"
msgid "strshowallconstraints"
@@ -1319,7 +1319,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Funcţie"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funcţii"
msgid "strshowallfunctions"
@@ -1419,10 +1419,10 @@ msgid "strargremoveconfirm"
msgstr "Sigur eliminaţi acest argument? Această acţiune NU poate fi revocată."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Declanşator"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Declanşatori"
msgid "strshowalltriggers"
@@ -1580,7 +1580,7 @@ msgstr "Pseudo"
msgid "strschema"
msgstr "Schemă"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Scheme"
msgid "strshowallschemas"
@@ -1622,7 +1622,7 @@ msgstr "Schemă modificată."
msgid "strschemaalteredbad"
msgstr "Modificare schemă eşuată."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Cale de căutare pentru schemă"
# Reports
@@ -1631,7 +1631,7 @@ msgstr "Cale de căutare pentru schemă"
msgid "strdomain"
msgstr "Domeniu"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domenii"
msgid "strshowalldomains"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 84842f3cd..c3fe5be97 100644
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index b951490f6..a6c549fde 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -164,7 +164,7 @@ msgstr "Включить автодополнение"
msgid "strsave"
msgstr "Сохранить"
-msgid "strreset"
+msgid "Reset"
msgstr "Сбросить"
msgid "strinsert"
@@ -200,7 +200,7 @@ msgstr "Редактировать"
msgid "strcolumn"
msgstr "Атрибут"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Атрибуты"
msgid "strrows"
@@ -359,10 +359,10 @@ msgstr "Редактировать SQL"
msgid "strruntime"
msgstr "Время выполнения: %s мсек"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Нумеровать страницы с результатами"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "или загрузить SQL-скрипт:"
msgid "strstarttime"
@@ -550,7 +550,7 @@ msgstr "Ошибка подключения к серверу."
msgid "strtable"
msgstr "Таблица"
-msgid "strtables"
+msgid "Tables"
msgstr "Таблицы"
msgid "strshowalltables"
@@ -1075,7 +1075,7 @@ msgstr "Сигнал отправлен."
msgid "strsignalsentbad"
msgstr "Отправка сигнала прервана."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Все объекты"
msgid "strdatabasealtered"
@@ -1106,7 +1106,7 @@ msgstr "Вы действительно хотите кластеризоват
msgid "strview"
msgstr "Представление"
-msgid "strviews"
+msgid "Views"
msgstr "Представления"
msgid "strshowallviews"
@@ -1185,7 +1185,7 @@ msgstr "Вам необходимо определить как минимум
msgid "strsequence"
msgstr "Последовательность"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Последовательности"
msgid "strshowallsequences"
@@ -1282,7 +1282,7 @@ msgstr "Вам необходимо указать как минимун одн
msgid "strindex"
msgstr "Индекс"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Индексы"
msgid "strindexname"
@@ -1358,7 +1358,7 @@ msgid "strnoclusteravailable"
msgstr "Таблица не кластеризуема по индексу."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Правила"
msgid "strrule"
@@ -1401,7 +1401,7 @@ msgstr "Уничтожение правила прервано."
msgid "strconstraint"
msgstr "Ограничение"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Ограничения"
msgid "strshowallconstraints"
@@ -1495,7 +1495,7 @@ msgstr "при обновлении"
msgid "strfunction"
msgstr "Функция"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Функции"
msgid "strshowallfunctions"
@@ -1607,10 +1607,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "Вам необходимо указать как минимум одну функцию для удаления."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Триггер"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Триггеры"
msgid "strshowalltriggers"
@@ -1783,7 +1783,7 @@ msgstr "Перечислимые значения"
msgid "strschema"
msgstr "Схема"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Схемы"
msgid "strshowallschemas"
@@ -1825,7 +1825,7 @@ msgstr "Схема обновлена."
msgid "strschemaalteredbad"
msgstr "Обновление схемы прервано."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Пути поиска в схемах"
msgid "strspecifyschematodrop"
@@ -1837,7 +1837,7 @@ msgstr "Вам необходимо указать как минимум одн
msgid "strdomain"
msgstr "Домен"
-msgid "strdomains"
+msgid "Domains"
msgstr "Домены"
msgid "strshowalldomains"
diff --git a/locale/sk_SK/LC_MESSAGES/messages.mo b/locale/sk_SK/LC_MESSAGES/messages.mo
index 6d9601ca3..9135fad5e 100644
Binary files a/locale/sk_SK/LC_MESSAGES/messages.mo and b/locale/sk_SK/LC_MESSAGES/messages.mo differ
diff --git a/locale/sk_SK/LC_MESSAGES/messages.po b/locale/sk_SK/LC_MESSAGES/messages.po
index 40b38a431..50bd0e13e 100644
--- a/locale/sk_SK/LC_MESSAGES/messages.po
+++ b/locale/sk_SK/LC_MESSAGES/messages.po
@@ -143,7 +143,7 @@ msgstr "Zrušiť"
msgid "strsave"
msgstr "Uložiť"
-msgid "strreset"
+msgid "Reset"
msgstr "Reset"
msgid "strinsert"
@@ -179,7 +179,7 @@ msgstr "Upraviť"
msgid "strcolumn"
msgstr "Stĺpec"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Stĺpce"
msgid "strrows"
@@ -350,10 +350,10 @@ msgstr "Upraviť SQL"
msgid "strruntime"
msgstr "Celkový beh: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Výsledky stránkovania"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "alebo uploadni SQL skript:"
msgid "strstarttime"
@@ -436,7 +436,7 @@ msgstr "Dump komplexných tabuliek a schém nie je na platforme Windows podporov
msgid "strtable"
msgstr "Tabuľka"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabuľky"
msgid "strshowalltables"
@@ -847,7 +847,7 @@ msgstr "Signál odoslaný."
msgid "strsignalsentbad"
msgstr "Odoslanie signálu zlyhalo."
-msgid "strallobjects"
+msgid "All objects"
msgstr "Všetky objekty"
msgid "strdatabasealtered"
@@ -860,7 +860,7 @@ msgstr "Databáza nebola zmenená."
msgid "strview"
msgstr "Náhľad"
-msgid "strviews"
+msgid "Views"
msgstr "Náhľady"
msgid "strshowallviews"
@@ -921,7 +921,7 @@ msgstr "Vytvoriť náhľad cez \"pomocníka\""
msgid "strsequence"
msgstr "Sekvencia"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sekvencie"
msgid "strshowallsequences"
@@ -988,7 +988,7 @@ msgstr "Sekvencia nebola resetovaná."
msgid "strindex"
msgstr "Index"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indexy"
msgid "strindexname"
@@ -1064,7 +1064,7 @@ msgid "strcluster"
msgstr "Cluster"
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Pravidlá"
msgid "strrule"
@@ -1107,7 +1107,7 @@ msgstr "Pravidlo nebolo zmazané."
msgid "strconstraint"
msgstr "Obmedzenie"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Obmedzenia"
msgid "strshowallconstraints"
@@ -1201,7 +1201,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Funkcia"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funkcie"
msgid "strshowallfunctions"
@@ -1268,11 +1268,11 @@ msgid "strlinksymbol"
msgstr "Link symbol"
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Trigger"
# su to medzipravidla ?? po cesky spouste..
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Trigger-y"
msgid "strshowalltriggers"
@@ -1413,7 +1413,7 @@ msgstr "Pseudo"
msgid "strschema"
msgstr "Schéma"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Schémy"
msgid "strshowallschemas"
@@ -1455,7 +1455,7 @@ msgstr "Schéma zmenená."
msgid "strschemaalteredbad"
msgstr "Schéma nebola zmenená."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Cesta k nájdeniu Schémy"
# Reports
@@ -1464,7 +1464,7 @@ msgstr "Cesta k nájdeniu Schémy"
msgid "strdomain"
msgstr "Doména"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domény"
msgid "strshowalldomains"
diff --git a/locale/sv_SE/LC_MESSAGES/messages.mo b/locale/sv_SE/LC_MESSAGES/messages.mo
index 5df07ae8d..cd47a59db 100644
Binary files a/locale/sv_SE/LC_MESSAGES/messages.mo and b/locale/sv_SE/LC_MESSAGES/messages.mo differ
diff --git a/locale/sv_SE/LC_MESSAGES/messages.po b/locale/sv_SE/LC_MESSAGES/messages.po
index 776bd2792..719ace8df 100644
--- a/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/locale/sv_SE/LC_MESSAGES/messages.po
@@ -134,7 +134,7 @@ msgstr "Ångra"
msgid "strsave"
msgstr "Spara"
-msgid "strreset"
+msgid "Reset"
msgstr "Nollställ"
msgid "strinsert"
@@ -167,7 +167,7 @@ msgstr "Falskt"
msgid "stredit"
msgstr "Redigera"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Kolumner"
msgid "strrows"
@@ -355,7 +355,7 @@ msgstr "Ingen unik nyckel för denna rad."
msgid "strtable"
msgstr "Tabell"
-msgid "strtables"
+msgid "Tables"
msgstr "Tabeller"
msgid "strshowalltables"
@@ -747,7 +747,7 @@ msgstr "Struktur och data"
msgid "strview"
msgstr "Vy"
-msgid "strviews"
+msgid "Views"
msgstr "Vyer"
msgid "strshowallviews"
@@ -802,7 +802,7 @@ msgstr "Ytterligare villkor"
msgid "strsequence"
msgstr "Sekvens"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sekvenser"
msgid "strshowallsequences"
@@ -863,7 +863,7 @@ msgstr "Misslyckades att radera sekvens."
msgid "strindex"
msgstr "Index"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Index"
msgid "strshowallindexes"
@@ -942,7 +942,7 @@ msgid "strclusteredbad"
msgstr "Klustring misslyckades."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Regler"
msgid "strrule"
@@ -982,7 +982,7 @@ msgid "strruledroppedbad"
msgstr "Misslyckades att radera regel."
# Constraints
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Begränsningar"
msgid "strshowallconstraints"
@@ -1076,7 +1076,7 @@ msgstr "VID UPPDATERING"
msgid "strfunction"
msgstr "Funktion"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Funktioner"
msgid "strshowallfunctions"
@@ -1131,10 +1131,10 @@ msgid "strfunctionupdatedbad"
msgstr "Misslyckades att uppdatera funktion."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Mekanism"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Mekanismer"
msgid "strshowalltriggers"
@@ -1244,7 +1244,7 @@ msgstr "Misslyckades att radera typ."
msgid "strschema"
msgstr "Schema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Scheman"
msgid "strshowallschemas"
@@ -1291,7 +1291,7 @@ msgstr "jS M, Y g:iA"
msgid "strdomain"
msgstr "Domän"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domäner"
msgid "strshowalldomains"
diff --git a/locale/tr_TR/LC_MESSAGES/messages.mo b/locale/tr_TR/LC_MESSAGES/messages.mo
index 639ea5b60..daab858dc 100644
Binary files a/locale/tr_TR/LC_MESSAGES/messages.mo and b/locale/tr_TR/LC_MESSAGES/messages.mo differ
diff --git a/locale/tr_TR/LC_MESSAGES/messages.po b/locale/tr_TR/LC_MESSAGES/messages.po
index 14e372ddc..2cb32ed32 100644
--- a/locale/tr_TR/LC_MESSAGES/messages.po
+++ b/locale/tr_TR/LC_MESSAGES/messages.po
@@ -143,7 +143,7 @@ msgstr "İptal Et"
msgid "strsave"
msgstr "Kaydet"
-msgid "strreset"
+msgid "Reset"
msgstr "Temizle"
msgid "strinsert"
@@ -179,7 +179,7 @@ msgstr "Düzenle"
msgid "strcolumn"
msgstr "KolonF"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Kolonlar"
msgid "strrows"
@@ -350,10 +350,10 @@ msgstr "SQL Düzenle"
msgid "strruntime"
msgstr "Toplam çalışma süresi: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Sonuçları sayfalandır."
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "ya da bir SQL betiği yükleyin:"
msgid "strstarttime"
@@ -436,7 +436,7 @@ msgstr "Dumping of complex table and schema names on Windows is not supported."
msgid "strtable"
msgstr "Tablo"
-msgid "strtables"
+msgid "Tables"
msgstr "Tablolar"
msgid "strshowalltables"
@@ -843,7 +843,7 @@ msgstr "Sinyal gönderildi."
msgid "strsignalsentbad"
msgstr "Sinyal gönderme işlemi başarısız oldu"
-msgid "strallobjects"
+msgid "All objects"
msgstr "Tüm nesneler"
msgid "strdatabasealtered"
@@ -856,7 +856,7 @@ msgstr "Veritabanı değiştirme başarısız oldu."
msgid "strview"
msgstr "View"
-msgid "strviews"
+msgid "Views"
msgstr "Viewlar"
msgid "strshowallviews"
@@ -917,7 +917,7 @@ msgstr "Sihirbaz ile view yaratın"
msgid "strsequence"
msgstr "Sequence"
-msgid "strsequences"
+msgid "Sequences"
msgstr "Sequences"
msgid "strshowallsequences"
@@ -984,7 +984,7 @@ msgstr "Sequence sıfırlama başarısız oldu."
msgid "strindex"
msgstr "Index"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Indeksler"
msgid "strindexname"
@@ -1060,7 +1060,7 @@ msgid "strcluster"
msgstr "Küme"
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Rules"
msgid "strrule"
@@ -1103,7 +1103,7 @@ msgstr "Rule silinme işlemi başarısız oldu."
msgid "strconstraint"
msgstr "Kısıtlama"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Kısıtlamalar"
msgid "strshowallconstraints"
@@ -1198,7 +1198,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Fonksiyon"
-msgid "strfunctions"
+msgid "Functions"
msgstr "Fonksiyonlar"
msgid "strshowallfunctions"
@@ -1265,10 +1265,10 @@ msgid "strlinksymbol"
msgstr "Bağlantı sembolü"
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Trigger"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "Triggerlar"
msgid "strshowalltriggers"
@@ -1408,7 +1408,7 @@ msgstr "Pseudo"
msgid "strschema"
msgstr "Şema"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Şemalar"
msgid "strshowallschemas"
@@ -1450,14 +1450,14 @@ msgstr "Schema değiştirildi."
msgid "strschemaalteredbad"
msgstr "Schema değiştirilme işlemi başarısız oldu."
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "Şema arama yolu"
# Reports
msgid "strdomain"
msgstr "Domain"
-msgid "strdomains"
+msgid "Domains"
msgstr "Domainler"
msgid "strshowalldomains"
diff --git a/locale/uk_UA/LC_MESSAGES/messages.mo b/locale/uk_UA/LC_MESSAGES/messages.mo
index 5f4d94a60..60e3c4652 100644
Binary files a/locale/uk_UA/LC_MESSAGES/messages.mo and b/locale/uk_UA/LC_MESSAGES/messages.mo differ
diff --git a/locale/uk_UA/LC_MESSAGES/messages.po b/locale/uk_UA/LC_MESSAGES/messages.po
index 61134b5a1..5d164b770 100644
--- a/locale/uk_UA/LC_MESSAGES/messages.po
+++ b/locale/uk_UA/LC_MESSAGES/messages.po
@@ -134,7 +134,7 @@ msgstr "Відмінити"
msgid "strsave"
msgstr "Зберегти"
-msgid "strreset"
+msgid "Reset"
msgstr "Скинути"
msgid "strinsert"
@@ -167,7 +167,7 @@ msgstr "Фальш"
msgid "stredit"
msgstr "Редагувати"
-msgid "strcolumns"
+msgid "Columns"
msgstr "Атрибути"
msgid "strrows"
@@ -326,10 +326,10 @@ msgstr "Редагувати SQL"
msgid "strruntime"
msgstr "Час виконання: %s мсек"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "Нумерувати сторінки з результатами"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "чи завантажити SQL-скрипт:"
msgid "strstarttime"
@@ -385,7 +385,7 @@ msgstr "Помилка каналу при імпортові %s."
msgid "strtable"
msgstr "Таблиця"
-msgid "strtables"
+msgid "Tables"
msgstr "Таблиці"
msgid "strshowalltables"
@@ -789,7 +789,7 @@ msgstr "Примусово"
msgid "strview"
msgstr "Показ"
-msgid "strviews"
+msgid "Views"
msgstr "Покази"
msgid "strshowallviews"
@@ -850,7 +850,7 @@ msgstr "Створити показ, скориставшись майстром
msgid "strsequence"
msgstr "Послідовність"
-msgid "strsequences"
+msgid "Sequences"
msgstr " Послідовності"
msgid "strshowallsequences"
@@ -917,7 +917,7 @@ msgstr "Скинення послідовності перервано."
msgid "strindex"
msgstr "Індекс"
-msgid "strindexes"
+msgid "Indexes"
msgstr "Індекси"
msgid "strshowallindexes"
@@ -990,7 +990,7 @@ msgid "strclusteredbad"
msgstr "Кластеризацію перервано."
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "Правила"
msgid "strrule"
@@ -1030,7 +1030,7 @@ msgid "strruledroppedbad"
msgstr "Видалення правила перервано."
# Constraints
-msgid "strconstraints"
+msgid "Constraints"
msgstr "Обмеження"
msgid "strshowallconstraints"
@@ -1124,7 +1124,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "Функція"
-msgid "strfunctions"
+msgid "Functions"
msgstr " Функції"
msgid "strshowallfunctions"
@@ -1179,10 +1179,10 @@ msgid "strfunctionupdatedbad"
msgstr "Оновлення функції перервано."
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "Трігер"
-msgid "strtriggers"
+msgid "Triggers"
msgstr " Трігери"
msgid "strshowalltriggers"
@@ -1292,7 +1292,7 @@ msgstr "Видалення типу даних перервано."
msgid "strschema"
msgstr "Схема"
-msgid "strschemas"
+msgid "Schemas"
msgstr "Схеми"
msgid "strshowallschemas"
@@ -1340,7 +1340,7 @@ msgstr "Оновлення схеми перервано."
msgid "strdomain"
msgstr "Домен"
-msgid "strdomains"
+msgid "Domains"
msgstr "Домени"
msgid "strshowalldomains"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index fa7eb1dc0..93c0bbf89 100644
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 590ca00c4..22fe75c6f 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -164,7 +164,7 @@ msgstr "自动完成有效"
msgid "strsave"
msgstr "保存"
-msgid "strreset"
+msgid "Reset"
msgstr "重置"
msgid "strrestart"
@@ -203,7 +203,7 @@ msgstr "编辑"
msgid "strcolumn"
msgstr "列"
-msgid "strcolumns"
+msgid "Columns"
msgstr "列"
msgid "strrows"
@@ -362,10 +362,10 @@ msgstr "编辑 SQL"
msgid "strruntime"
msgstr "总执行时间: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "分页结果"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "或者上传一个 SQL 脚本:"
msgid "strstarttime"
@@ -553,7 +553,7 @@ msgstr "无法连接服务器。"
msgid "strtable"
msgstr "数据表"
-msgid "strtables"
+msgid "Tables"
msgstr "数据表"
msgid "strshowalltables"
@@ -1081,7 +1081,7 @@ msgstr "信号已发送。"
msgid "strsignalsentbad"
msgstr "信号发送失败。"
-msgid "strallobjects"
+msgid "All objects"
msgstr "所有对象"
msgid "strdatabasealtered"
@@ -1112,7 +1112,7 @@ msgstr "你确定要集群数据库\"%s\"中的所有表吗?"
msgid "strview"
msgstr "视图"
-msgid "strviews"
+msgid "Views"
msgstr "视图"
msgid "strshowallviews"
@@ -1191,7 +1191,7 @@ msgstr "必须至少指定一个要移除的视图"
msgid "strsequence"
msgstr "序列"
-msgid "strsequences"
+msgid "Sequences"
msgstr "序列"
msgid "strshowallsequences"
@@ -1297,7 +1297,7 @@ msgstr "必须至少指定一个序列来删除"
msgid "strindex"
msgstr "索引"
-msgid "strindexes"
+msgid "Indexes"
msgstr "索引"
msgid "strindexname"
@@ -1376,7 +1376,7 @@ msgid "strnoclusteravailable"
msgstr "表中没有集群索引。"
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "规则"
msgid "strrule"
@@ -1419,7 +1419,7 @@ msgstr "规则删除失败。"
msgid "strconstraint"
msgstr "约束"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "约束"
msgid "strshowallconstraints"
@@ -1513,7 +1513,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "函数"
-msgid "strfunctions"
+msgid "Functions"
msgstr "函数"
msgid "strshowallfunctions"
@@ -1625,10 +1625,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "必须至少指定一个函数来删除"
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "触发器"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "触发器"
msgid "strshowalltriggers"
@@ -1801,7 +1801,7 @@ msgstr "枚举类型"
msgid "strschema"
msgstr "模式"
-msgid "strschemas"
+msgid "Schemas"
msgstr "模式"
msgid "strshowallschemas"
@@ -1843,7 +1843,7 @@ msgstr "模式已变更。"
msgid "strschemaalteredbad"
msgstr "模式变更失败。"
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "模式查找路径"
msgid "strspecifyschematodrop"
@@ -1855,7 +1855,7 @@ msgstr "必须至少指定一个模式来删除"
msgid "strdomain"
msgstr "域"
-msgid "strdomains"
+msgid "Domains"
msgstr "域"
msgid "strshowalldomains"
diff --git a/locale/zh_TW/LC_MESSAGES/messages.mo b/locale/zh_TW/LC_MESSAGES/messages.mo
index b59508e96..61d686a85 100644
Binary files a/locale/zh_TW/LC_MESSAGES/messages.mo and b/locale/zh_TW/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_TW/LC_MESSAGES/messages.po b/locale/zh_TW/LC_MESSAGES/messages.po
index a80885e77..981bfe24f 100644
--- a/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/locale/zh_TW/LC_MESSAGES/messages.po
@@ -155,7 +155,7 @@ msgstr "啟用自動完成"
msgid "strsave"
msgstr "儲存"
-msgid "strreset"
+msgid "Reset"
msgstr "重設"
msgid "strinsert"
@@ -191,7 +191,7 @@ msgstr "編輯"
msgid "strcolumn"
msgstr "欄位"
-msgid "strcolumns"
+msgid "Columns"
msgstr "欄位"
msgid "strrows"
@@ -347,10 +347,10 @@ msgstr "編輯 SQL"
msgid "strruntime"
msgstr "總共執行時間: %s ms"
-msgid "strpaginate"
+msgid "Paginate results"
msgstr "分頁顯示結果"
-msgid "struploadscript"
+msgid "or upload an SQL script:"
msgstr "或是上傳一個 SQL 稿本檔: "
msgid "strstarttime"
@@ -489,7 +489,7 @@ msgstr "沒有選擇資料庫!"
msgid "strtable"
msgstr "資料表"
-msgid "strtables"
+msgid "Tables"
msgstr "資料表"
msgid "strshowalltables"
@@ -984,7 +984,7 @@ msgstr "訊號傳遞。"
msgid "strsignalsentbad"
msgstr "傳遞訊號失敗。"
-msgid "strallobjects"
+msgid "All objects"
msgstr "全部物件"
msgid "strdatabasealtered"
@@ -1000,7 +1000,7 @@ msgstr "必須至少指定一個資料庫來移除"
msgid "strview"
msgstr "視觀表"
-msgid "strviews"
+msgid "Views"
msgstr "視觀表"
msgid "strshowallviews"
@@ -1073,7 +1073,7 @@ msgstr "必须至少指定一个视图来移除"
msgid "strsequence"
msgstr "序列數"
-msgid "strsequences"
+msgid "Sequences"
msgstr "序列數"
msgid "strshowallsequences"
@@ -1173,7 +1173,7 @@ msgstr "必須至少指定一個序列數來刪除"
msgid "strindex"
msgstr "索引"
-msgid "strindexes"
+msgid "Indexes"
msgstr "索引"
msgid "strindexname"
@@ -1246,7 +1246,7 @@ msgid "strclusteredbad"
msgstr "叢集已失敗。"
# Rules
-msgid "strrules"
+msgid "Rules"
msgstr "規則"
msgid "strrule"
@@ -1289,7 +1289,7 @@ msgstr "規則移除已失敗。"
msgid "strconstraint"
msgstr "約束限制"
-msgid "strconstraints"
+msgid "Constraints"
msgstr "約束限制"
msgid "strshowallconstraints"
@@ -1383,7 +1383,7 @@ msgstr "ON UPDATE"
msgid "strfunction"
msgstr "函數"
-msgid "strfunctions"
+msgid "Functions"
msgstr "函數"
msgid "strshowallfunctions"
@@ -1495,10 +1495,10 @@ msgid "strspecifyfunctiontodrop"
msgstr "必須至少指定一個函數來刪除"
# Triggers
-msgid "strtrigger"
+msgid "Trigger"
msgstr "觸發器"
-msgid "strtriggers"
+msgid "Triggers"
msgstr "觸發器"
msgid "strshowalltriggers"
@@ -1674,7 +1674,7 @@ msgstr "列舉類型"
msgid "strschema"
msgstr "架構模式"
-msgid "strschemas"
+msgid "Schemas"
msgstr "架構模式"
msgid "strshowallschemas"
@@ -1716,7 +1716,7 @@ msgstr "架構模式已修改。"
msgid "strschemaalteredbad"
msgstr "架構模式修改已失敗。"
-msgid "strsearchpath"
+msgid "Schema search path"
msgstr "架構模式搜尋路徑"
msgid "strspecifyschematodrop"
@@ -1728,7 +1728,7 @@ msgstr "您必須至少指定一個架構模式來刪除"
msgid "strdomain"
msgstr "共同值域"
-msgid "strdomains"
+msgid "Domains"
msgstr "共同值域"
msgid "strshowalldomains"
diff --git a/phpcs.xml b/phpcs.xml
index 535356efb..7a47c384a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -11,4 +11,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 74b56c667..0eac53b05 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -3,6 +3,7 @@ parameters:
paths:
- src/
- autoload.php
+ - all_db.php
- browser.php
- index.php
- intro.php
@@ -11,5 +12,6 @@ parameters:
- server-logout.php
- servers.php
- servers-tree.php
+ - sqledit.php
excludePaths:
- vendor/
\ No newline at end of file
diff --git a/sqledit.php b/sqledit.php
index 3753604da..92f9ce72f 100644
--- a/sqledit.php
+++ b/sqledit.php
@@ -1,166 +1,10 @@
printConnection($onchange);
-}
-
- /**
- * Searches for a named database object
- */
-function doFind()
-{
- global $data, $misc;
- global $lang, $conf;
-
- if (!isset($_REQUEST['term'])) {
- $_REQUEST['term'] = '';
- }
- if (!isset($_REQUEST['filter'])) {
- $_REQUEST['filter'] = '';
- }
-
- $misc->printHeader($lang['strfind']);
-
- // Bring to the front always
- echo "\n";
-
- $misc->printTabs($misc->getNavTabs('popup'), 'find');
-
- echo "\n";
-
- // Default focus
- $misc->setFocus('forms[0].term');
-}
-
-/**
- * Allow execution of arbitrary SQL statements on a database
- */
-function doDefault()
-{
- global $data, $misc;
- global $lang;
-
- if (!isset($_SESSION['sqlquery'])) {
- $_SESSION['sqlquery'] = '';
- }
-
- $misc->printHeader($lang['strsql']);
-
- // Bring to the front always
- echo "\n";
-
- $misc->printTabs($misc->getNavTabs('popup'), 'sql');
-
- echo "\n";
-
- // Default focus
- $misc->setFocus('forms[0].query');
-}
-
-switch ($action) {
- case 'find':
- doFind();
- break;
- case 'sql':
- default:
- doDefault();
- break;
-}
-
-// Set the name of the window
-$misc->setWindowName('sqledit');
-
-$misc->printFooter();
+$website = new SqlEdit();
+echo $website->buildHtmlString();
diff --git a/src/Api/Servers/Tree.php b/src/Api/Servers/Tree.php
index dfb724ba7..edca84dae 100644
--- a/src/Api/Servers/Tree.php
+++ b/src/Api/Servers/Tree.php
@@ -7,7 +7,7 @@
use PhpPgAdmin\{Config, RequestParameter, Session};
use PhpPgAdmin\DDD\Entities\ServerSession;
-class Tree
+final class Tree
{
public function __construct()
{
@@ -33,9 +33,9 @@ public function outputXmlTree(): void
foreach ($dbs as $dbData) {
$actionUrl = 'redirect.php';
$actionUrlParams = [
- 'subject' => 'database',
+ 'database' => $dbData['datname'],
'server' => $serverSession->id(),
- 'database' => $dbData['datname']
+ 'subject' => 'database',
];
$srcUrl = 'database.php';
$srcUrlParams = $actionUrlParams;
@@ -58,8 +58,8 @@ public function outputXmlTree(): void
$tree->setAttribute('text', (string)$configuredServer->Name);
$serverId = $configuredServer->id();
$actionUrlParams = [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
];
$actionUrl = 'redirect.php?' . http_build_query($actionUrlParams);
$tree->setAttribute('action', $actionUrl);
@@ -74,7 +74,7 @@ public function outputXmlTree(): void
$username = $logins[$serverId]['username'];
$srcUrlParams = [
- 'server' => $serverId
+ 'server' => $serverId,
];
$srcUrl = 'servers-tree.php?' . http_build_query($srcUrlParams);
$tree->setAttribute('src', $srcUrl);
diff --git a/src/ArrayRecordSet.php b/src/ArrayRecordSet.php
deleted file mode 100644
index 4c9352a69..000000000
--- a/src/ArrayRecordSet.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- */
- private array $array;
- public bool $EOF = false;
- public mixed $fields;
-
- /**
- * @param array $data
- */
- public function __construct(array $data)
- {
- $this->array = $data;
- $this->fields = reset($this->array);
- if ($this->fields === false) {
- $this->EOF = true;
- }
- }
-
- public function recordCount(): int
- {
- return count($this->array);
- }
-
- public function moveNext(): void
- {
- $this->fields = next($this->array);
- if ($this->fields === false) {
- $this->EOF = true;
- }
- }
-}
diff --git a/src/Config.php b/src/Config.php
index a8f8509a3..f1925673d 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -18,16 +18,18 @@
* 'show_system'?: bool
* }
*/
-class Config
+final class Config
{
/**
* @var array|null
*/
private static ?array $availableLocales = null;
+
/**
* @var ConfigData|null
*/
private static ?array $conf = null;
+
/**
* @var array{'locale'?: string, 'theme'?: string}
*/
@@ -96,21 +98,6 @@ public static function getIcon(string|array $icon): string
return '';
}
- private static function getNormalizedLocaleFromLocaleOrLanguage(string $localeOrLanguage): ?string
- {
- if (preg_match('/^(?P[a-z]{2})[_-](?P[A-Z]{2})$/i', $localeOrLanguage, $matches)) {
- return strtolower($matches['language']) . '_' . strtoupper($matches['region']);
- }
-
- $lowerCasedLocaleOrLanguage = strtolower($localeOrLanguage);
- $languageIdsWithLocales = Language::getAvailableLanguageIdsWithLocales();
- if (isset($languageIdsWithLocales[$lowerCasedLocaleOrLanguage])) {
- return $languageIdsWithLocales[$lowerCasedLocaleOrLanguage];
- }
-
- return null;
- }
-
/**
* @return Server[]
*/
@@ -231,22 +218,6 @@ public static function locale(): string
return self::$data['locale'];
}
- private static function languageIsAvailable(string $language): bool
- {
- $normalizedLocale = self::getNormalizedLocaleFromLocaleOrLanguage($language);
- if (is_null($normalizedLocale)) {
- return false;
- }
- $availableLocales = self::getAvailableLocales();
- foreach ($availableLocales as $locale) {
- if ($locale === $normalizedLocale) {
- return true;
- }
- }
-
- return false;
- }
-
/**
* @param string $serverId Server ID in the format host:port:sslmode
*/
@@ -342,6 +313,37 @@ public static function theme(): string
return self::$data['theme'];
}
+ private static function getNormalizedLocaleFromLocaleOrLanguage(string $localeOrLanguage): ?string
+ {
+ if (preg_match('/^(?P[a-z]{2})[_-](?P[A-Z]{2})$/i', $localeOrLanguage, $matches)) {
+ return strtolower($matches['language']) . '_' . strtoupper($matches['region']);
+ }
+
+ $lowerCasedLocaleOrLanguage = strtolower($localeOrLanguage);
+ $languageIdsWithLocales = Language::getAvailableLanguageIdsWithLocales();
+ if (isset($languageIdsWithLocales[$lowerCasedLocaleOrLanguage])) {
+ return $languageIdsWithLocales[$lowerCasedLocaleOrLanguage];
+ }
+
+ return null;
+ }
+
+ private static function languageIsAvailable(string $language): bool
+ {
+ $normalizedLocale = self::getNormalizedLocaleFromLocaleOrLanguage($language);
+ if (is_null($normalizedLocale)) {
+ return false;
+ }
+ $availableLocales = self::getAvailableLocales();
+ foreach ($availableLocales as $locale) {
+ if ($locale === $normalizedLocale) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
/**
* @return ConfigData
*/
diff --git a/src/DDD/Entities/Server.php b/src/DDD/Entities/Server.php
index 7f6c0eb58..964db3bde 100644
--- a/src/DDD/Entities/Server.php
+++ b/src/DDD/Entities/Server.php
@@ -28,25 +28,6 @@ public function __construct(
) {
}
- public function __get(string $name): mixed
- {
- return match ($name) {
- 'Name' => $this->name,
- 'Host' => $this->host,
- 'Port' => $this->port,
- 'SslMode' => $this->sslMode,
- 'DefaultDb' => $this->defaultDb,
- 'PgDumpPath' => $this->pgDumpPath,
- 'PgDumpAllPath' => $this->pgDumpAllPath,
- default => null,
- };
- }
-
- public function id(): string
- {
- return (string)$this->host . ':' . $this->port->Value . ':' . $this->sslMode->value;
- }
-
/**
* @param array $input
*/
@@ -92,4 +73,23 @@ public static function fromArray(array $input): self
pgDumpAllPath: new Filename($pgDumpAllPath)
);
}
+
+ public function id(): string
+ {
+ return (string)$this->host . ':' . $this->port->Value . ':' . $this->sslMode->value;
+ }
+
+ public function __get(string $name): mixed
+ {
+ return match ($name) {
+ 'Name' => $this->name,
+ 'Host' => $this->host,
+ 'Port' => $this->port,
+ 'SslMode' => $this->sslMode,
+ 'DefaultDb' => $this->defaultDb,
+ 'PgDumpPath' => $this->pgDumpPath,
+ 'PgDumpAllPath' => $this->pgDumpAllPath,
+ default => null,
+ };
+ }
}
diff --git a/src/DDD/Entities/ServerSession.php b/src/DDD/Entities/ServerSession.php
index fd7e5cded..a76c4dd1d 100644
--- a/src/DDD/Entities/ServerSession.php
+++ b/src/DDD/Entities/ServerSession.php
@@ -21,7 +21,7 @@
* @property-read SslMode $SslMode
* @property-read Username $Username
*/
-class ServerSession extends Server
+final class ServerSession extends Server
{
public function __construct(
private Username $username,
@@ -46,16 +46,6 @@ public function __construct(
);
}
- public function __get(string $name): mixed
- {
- return match ($name) {
- 'Password' => $this->password,
- 'Platform' => $this->platform,
- 'Username' => $this->username,
- default => parent::__get($name),
- };
- }
-
public static function fromServerId(string $serverId): ?self
{
$servers = Config::getServers();
@@ -169,4 +159,14 @@ public static function isLoggedIn(string $serverId): bool
return false;
}
+
+ public function __get(string $name): mixed
+ {
+ return match ($name) {
+ 'Password' => $this->password,
+ 'Platform' => $this->platform,
+ 'Username' => $this->username,
+ default => parent::__get($name),
+ };
+ }
}
diff --git a/src/DDD/ValueObjects/DbSize.php b/src/DDD/ValueObjects/DbSize.php
index c8f20a300..13dfc87f8 100644
--- a/src/DDD/ValueObjects/DbSize.php
+++ b/src/DDD/ValueObjects/DbSize.php
@@ -16,19 +16,6 @@ public function __construct(private readonly int $size)
}
}
- public function __get(string $name): mixed
- {
- return match ($name) {
- 'Value' => $this->size,
- default => throw new \InvalidArgumentException("Property '$name' does not exist."),
- };
- }
-
- public function __toString(): string
- {
- return (string)$this->size;
- }
-
public function prettyFormat(): string
{
$multiplier = 1;
@@ -39,7 +26,7 @@ public function prettyFormat(): string
_('kB'),
_('MB'),
_('GB'),
- _('TB')
+ _('TB'),
];
foreach ($unitStrings as $unitString) {
if ($this->size < $limit * $multiplier) {
@@ -51,4 +38,17 @@ public function prettyFormat(): string
$multiplier /= 1_024;
return sprintf('%d %s', floor(($this->size + $multiplier / 2) / $multiplier), $unitString);
}
+
+ public function __get(string $name): mixed
+ {
+ return match ($name) {
+ 'Value' => $this->size,
+ default => throw new \InvalidArgumentException("Property '$name' does not exist."),
+ };
+ }
+
+ public function __toString(): string
+ {
+ return (string)$this->size;
+ }
}
diff --git a/src/DDD/ValueObjects/Server/DatabaseName.php b/src/DDD/ValueObjects/Server/DatabaseName.php
index deabb8c99..515fd6fc3 100644
--- a/src/DDD/ValueObjects/Server/DatabaseName.php
+++ b/src/DDD/ValueObjects/Server/DatabaseName.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin\DDD\ValueObjects\Server;
-class DatabaseName implements \Stringable
+final class DatabaseName implements \Stringable
{
private string $name = '';
diff --git a/src/DDD/ValueObjects/Server/Filename.php b/src/DDD/ValueObjects/Server/Filename.php
index 6116bd39f..02c0e14c7 100644
--- a/src/DDD/ValueObjects/Server/Filename.php
+++ b/src/DDD/ValueObjects/Server/Filename.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin\DDD\ValueObjects\Server;
-class Filename implements \Stringable
+final class Filename implements \Stringable
{
public function __construct(private string $filename)
{
diff --git a/src/DDD/ValueObjects/Server/Host.php b/src/DDD/ValueObjects/Server/Host.php
index a5e2c333f..5d1af6c59 100644
--- a/src/DDD/ValueObjects/Server/Host.php
+++ b/src/DDD/ValueObjects/Server/Host.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin\DDD\ValueObjects\Server;
-class Host implements \Stringable
+final class Host implements \Stringable
{
private string $host = '';
diff --git a/src/DDD/ValueObjects/Server/Name.php b/src/DDD/ValueObjects/Server/Name.php
index 53df48c68..c11dc2435 100644
--- a/src/DDD/ValueObjects/Server/Name.php
+++ b/src/DDD/ValueObjects/Server/Name.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin\DDD\ValueObjects\Server;
-class Name implements \Stringable
+final class Name implements \Stringable
{
private string $name = '';
diff --git a/src/DDD/ValueObjects/Server/Port.php b/src/DDD/ValueObjects/Server/Port.php
index 1d38f577a..4567f7ec9 100644
--- a/src/DDD/ValueObjects/Server/Port.php
+++ b/src/DDD/ValueObjects/Server/Port.php
@@ -7,17 +7,13 @@
/**
* @property-read int $Value
*/
-class Port
+final class Port
{
- private int $port = 5432;
-
- public function __construct(int $port = 5432)
+ public function __construct(private int $port = 5432)
{
if ($port < 1 || $port > 65535) {
throw new \InvalidArgumentException('Port must be between 1 and 65535');
}
-
- $this->port = $port;
}
public function __get(string $name): mixed
diff --git a/src/DDD/ValueObjects/ServerSession/Password.php b/src/DDD/ValueObjects/ServerSession/Password.php
index 0b5c8c086..412ddf582 100644
--- a/src/DDD/ValueObjects/ServerSession/Password.php
+++ b/src/DDD/ValueObjects/ServerSession/Password.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin\DDD\ValueObjects\ServerSession;
-class Password implements \Stringable
+final class Password implements \Stringable
{
private string $password = '';
diff --git a/src/DDD/ValueObjects/ServerSession/Platform.php b/src/DDD/ValueObjects/ServerSession/Platform.php
index 1fd64039a..ab1a4baea 100644
--- a/src/DDD/ValueObjects/ServerSession/Platform.php
+++ b/src/DDD/ValueObjects/ServerSession/Platform.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin\DDD\ValueObjects\ServerSession;
-class Platform implements \Stringable
+final class Platform implements \Stringable
{
private string $name = '';
diff --git a/src/DDD/ValueObjects/ServerSession/Username.php b/src/DDD/ValueObjects/ServerSession/Username.php
index b08654dcc..110211a08 100644
--- a/src/DDD/ValueObjects/ServerSession/Username.php
+++ b/src/DDD/ValueObjects/ServerSession/Username.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin\DDD\ValueObjects\ServerSession;
-class Username implements \Stringable
+final class Username implements \Stringable
{
private string $name = '';
diff --git a/src/Database/PhpPgAdminConnection.php b/src/Database/PhpPgAdminConnection.php
index b8cf3939e..14faf90ec 100644
--- a/src/Database/PhpPgAdminConnection.php
+++ b/src/Database/PhpPgAdminConnection.php
@@ -51,10 +51,25 @@ final class PhpPgAdminConnection extends \PDO
'WIN1251' => 'CP1251',
'WIN1252' => 'CP1252',
'WIN1256' => 'CP1256',
- 'WIN1258' => 'CP1258'
+ 'WIN1258' => 'CP1258',
];
public const MAX_NAME_LENGTH = 63;
+ public static function create(
+ string $host,
+ int $port,
+ string $sslmode,
+ string $user,
+ string $password,
+ string $database,
+ ): self {
+ $dsn = "pgsql:host={$host};port={$port};sslmode={$sslmode};dbname={$database}";
+ $pdo = new self(dsn: $dsn, username: $user, password: $password);
+ $pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
+
+ return $pdo;
+ }
+
public function alterDatabase(
string $dbName,
string $newName,
@@ -128,21 +143,6 @@ public function alterDatabaseRename(string $oldName, string $newName): void
}
}
- public static function create(
- string $host,
- int $port,
- string $sslmode,
- string $user,
- string $password,
- string $database,
- ): self {
- $dsn = "pgsql:host={$host};port={$port};sslmode={$sslmode};dbname={$database}";
- $pdo = new self(dsn: $dsn, username: $user, password: $password);
- $pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
-
- return $pdo;
- }
-
public function createDatabase(
string $database,
string $encoding,
@@ -206,15 +206,6 @@ public function dropDatabase(string $database): void
}
}
- /**
- * From PHP 8.4 on, there is a native escapeIdentifier function.
- * @see https://www.php.net/manual/en/pdo-pgsql.escapeidentifier.php
- */
- private static function escapeIdentifier(string $identifier): string
- {
- return str_replace('"', '""', $identifier);
- }
-
/**
* @return string[]
*/
@@ -276,7 +267,7 @@ public function getDatabaseOwner(string $database): string
FROM pg_user, pg_database
WHERE pg_user.usesysid = pg_database.datdba AND pg_database.datname = :database";
$sqlParams = [
- 'database' => $database
+ 'database' => $database,
];
$statement = $this->prepare($sql);
if ($statement === false) {
@@ -367,15 +358,15 @@ public function getDatabases(): array
isset($row['dbsize']) && is_int($row['dbsize'])
) {
$result[] = [
- 'datname' => $row['datname'],
- 'datowner' => $row['datowner'],
- 'datencoding' => $row['datencoding'],
'datcollate' => $row['datcollate'],
- 'datctype' => $row['datctype'],
- 'tablespace' => $row['tablespace'],
- 'dbsize' => $row['dbsize'],
'datcomment' => isset($row['datcomment']) && is_string($row['datcomment']) ?
$row['datcomment'] : '',
+ 'datctype' => $row['datctype'],
+ 'datencoding' => $row['datencoding'],
+ 'datname' => $row['datname'],
+ 'datowner' => $row['datowner'],
+ 'dbsize' => $row['dbsize'],
+ 'tablespace' => $row['tablespace'],
];
}
}
@@ -417,13 +408,13 @@ public function getUsers(): array
isset($row['usecreatedb']) && is_bool($row['usecreatedb'])
) {
$result[] = [
- 'usename' => $row['usename'],
- 'usesuper' => $row['usesuper'],
+ 'useconfig' => isset($row['useconfig']) && is_string($row['useconfig']) ?
+ $row['useconfig'] : '',
'usecreatedb' => $row['usecreatedb'],
'useexpires' => isset($row['useexpires']) && is_string($row['useexpires']) ?
$row['useexpires'] : '',
- 'useconfig' => isset($row['useconfig']) && is_string($row['useconfig']) ?
- $row['useconfig'] : '',
+ 'usename' => $row['usename'],
+ 'usesuper' => $row['usesuper'],
];
}
}
@@ -470,6 +461,17 @@ public function isSuperUser(string $username = ''): bool
return false;
}
+ public function setDatabaseComment(string $database, ?string $comment = null): void
+ {
+ $escapedDatabase = self::escapeIdentifier($database);
+ $statement = "COMMENT ON DATABASE \"{$escapedDatabase}\" IS ";
+ $statement .= !is_null($comment) ? $this->quote($comment) : 'NULL';
+
+ if ($this->exec($statement) === false) {
+ throw new \PDOException('Failed to execute SQL statement for setting database comment.');
+ }
+ }
+
public static function loginDataIsValid(
string $host,
int $port,
@@ -486,14 +488,13 @@ public static function loginDataIsValid(
}
}
- public function setDatabaseComment(string $database, ?string $comment = null): void
+ /**
+ * From PHP 8.4 on, there is a native escapeIdentifier function.
+ *
+ * @see https://www.php.net/manual/en/pdo-pgsql.escapeidentifier.php
+ */
+ private static function escapeIdentifier(string $identifier): string
{
- $escapedDatabase = self::escapeIdentifier($database);
- $statement = "COMMENT ON DATABASE \"{$escapedDatabase}\" IS ";
- $statement .= !is_null($comment) ? $this->quote($comment) : 'NULL';
-
- if ($this->exec($statement) === false) {
- throw new \PDOException('Failed to execute SQL statement for setting database comment.');
- }
+ return str_replace('"', '""', $identifier);
}
}
diff --git a/src/Language.php b/src/Language.php
index ad65ca83b..da9c77414 100644
--- a/src/Language.php
+++ b/src/Language.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin;
-class Language
+final class Language
{
/**
* @return array
@@ -40,7 +40,7 @@ public static function getAvailableLanguageIdsWithLocales(): array
'spanish' => 'es_ES',
'swedish' => 'sv_SE',
'turkish' => 'tr_TR',
- 'ukrainian' => 'uk_UA'
+ 'ukrainian' => 'uk_UA',
];
}
diff --git a/src/RequestParameter.php b/src/RequestParameter.php
index 593b41158..2bfe328f7 100644
--- a/src/RequestParameter.php
+++ b/src/RequestParameter.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin;
-class RequestParameter
+final class RequestParameter
{
public static function getString(string $name, ?string $default = null): ?string
{
diff --git a/src/Session.php b/src/Session.php
index 14243d8f1..c8ba1eef1 100644
--- a/src/Session.php
+++ b/src/Session.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin;
-class Session
+final class Session
{
public const NAME = 'PPA_ID';
diff --git a/src/Themes.php b/src/Themes.php
index a6e21fbb2..75fa37272 100644
--- a/src/Themes.php
+++ b/src/Themes.php
@@ -4,7 +4,7 @@
namespace PhpPgAdmin;
-class Themes
+final class Themes
{
/**
* @return array
@@ -12,11 +12,11 @@ class Themes
public static function available(): array
{
return [
- 'default' => 'Default',
+ 'bootstrap' => 'Bootstrap3',
'cappuccino' => 'Cappuccino',
+ 'dark' => 'Dark',
+ 'default' => 'Default',
'gotar' => 'Blue/Green',
- 'bootstrap' => 'Bootstrap3',
- 'dark' => 'Dark'
];
}
diff --git a/src/Website.php b/src/Website.php
index 50b14cb29..35e2781ce 100644
--- a/src/Website.php
+++ b/src/Website.php
@@ -14,8 +14,8 @@ abstract class Website
*/
protected array $scripts = [
'jquery' => [
- 'src' => 'libraries/js/jquery-3.7.1.min.js'
- ]
+ 'src' => 'libraries/js/jquery-3.7.1.min.js',
+ ],
];
protected string $title = '';
@@ -31,11 +31,6 @@ public function __construct()
bindtextdomain('messages', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'locale');
}
- protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
- {
- return $dom->createElement('body');
- }
-
public function buildHtmlDocument(): \DOMDocument
{
$domImpl = new \DOMImplementation();
@@ -53,6 +48,17 @@ public function buildHtmlDocument(): \DOMDocument
return $dom;
}
+ public function buildHtmlString(): string
+ {
+ $dom = $this->buildHtmlDocument();
+ return $dom->saveHTML() ?: '';
+ }
+
+ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
+ {
+ return $dom->createElement('body');
+ }
+
protected function buildHtmlHead(\DOMDocument $dom): \DOMElement
{
$head = $dom->createElement('head');
@@ -103,12 +109,6 @@ protected function buildHtmlHead(\DOMDocument $dom): \DOMElement
return $head;
}
- public function buildHtmlString(): string
- {
- $dom = $this->buildHtmlDocument();
- return $dom->saveHTML() ?: '';
- }
-
protected function buildTitle(\DOMDocument $dom, string $title): \DOMElement
{
return $dom->createElement('h2', $title);
diff --git a/src/Website/AllDb.php b/src/Website/AllDb.php
index fa3697357..d301ba1f7 100644
--- a/src/Website/AllDb.php
+++ b/src/Website/AllDb.php
@@ -8,7 +8,7 @@
use PhpPgAdmin\DDD\Entities\ServerSession;
use PhpPgAdmin\DDD\ValueObjects\TrailSubject;
-class AllDb extends Website
+final class AllDb extends Website
{
public function __construct()
{
@@ -30,63 +30,63 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
$actionParam = RequestParameter::getString('action');
$tabLinks = [
[
- 'url' => 'all_db.php',
- 'url-params' => [
- 'subject' => 'server',
- 'server' => $serverId
- ],
- 'label' => _('Databases'),
- 'icon' => 'Databases',
'active' => is_null($actionParam),
'help' => [
'url' => 'help.php',
'url-params' => [
'help' => 'pg.role',
- 'server' => $serverId
- ]
- ]
- ],
- [
- 'url' => 'roles.php',
+ 'server' => $serverId,
+ ],
+ ],
+ 'icon' => 'Databases',
+ 'label' => _('Databases'),
+ 'url' => 'all_db.php',
'url-params' => [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
],
- 'label' => _('Roles'),
- 'icon' => 'Roles',
+ ],
+ [
'help' => [
'url' => 'help.php',
'url-params' => [
'help' => 'pg.role',
- 'server' => $serverId
- ]
- ]
- ],
- [
- 'url' => 'tablespaces.php',
+ 'server' => $serverId,
+ ],
+ ],
+ 'icon' => 'Roles',
+ 'label' => _('Roles'),
+ 'url' => 'roles.php',
'url-params' => [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
],
- 'label' => _('Tablespaces'),
- 'icon' => 'Tablespaces',
+ ],
+ [
'help' => [
'url' => 'help.php',
'url-params' => [
'help' => 'pg.tablespace',
- 'server' => $serverId
- ]
- ]
+ 'server' => $serverId,
+ ],
+ ],
+ 'icon' => 'Tablespaces',
+ 'label' => _('Tablespaces'),
+ 'url' => 'tablespaces.php',
+ 'url-params' => [
+ 'server' => $serverId,
+ 'subject' => 'server',
+ ],
],
[
+ 'active' => $actionParam === 'export',
+ 'icon' => 'Export',
+ 'label' => _('Export'),
'url' => 'all_db_export.php',
'url-params' => [
- 'server' => $serverId
+ 'server' => $serverId,
],
- 'label' => _('Export'),
- 'icon' => 'Export',
- 'active' => $actionParam === 'export'
- ]
+ ],
];
$body->appendChild(WebsiteComponents::buildServerDatabasesTabs($dom, $tabLinks));
@@ -108,12 +108,12 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
$navLinks = [
[
+ 'label' => _('Create database'),
'url' => 'create_db.php',
'url-params' => [
- 'server' => RequestParameter::getString('server') ?? ''
+ 'server' => RequestParameter::getString('server') ?? '',
],
- 'label' => _('Create database')
- ]
+ ],
];
$body->appendChild(WebsiteComponents::buildNavLinks($dom, $navLinks));
diff --git a/src/Website/AllDbExport.php b/src/Website/AllDbExport.php
index 88d9d87df..9b0d24bcb 100644
--- a/src/Website/AllDbExport.php
+++ b/src/Website/AllDbExport.php
@@ -7,7 +7,7 @@
use PhpPgAdmin\DDD\ValueObjects\TrailSubject;
use PhpPgAdmin\{RequestParameter, Website, WebsiteComponents};
-class AllDbExport extends Website
+final class AllDbExport extends Website
{
public function __construct()
{
@@ -26,62 +26,62 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
$serverId = RequestParameter::getString('server') ?? '';
$tabLinks = [
[
+ 'help' => [
+ 'url' => 'help.php',
+ 'url-params' => [
+ 'help' => 'pg.role',
+ 'server' => $serverId,
+ ],
+ ],
+ 'icon' => 'Databases',
+ 'label' => _('Databases'),
'url' => 'all_db.php',
'url-params' => [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
],
- 'label' => _('Databases'),
- 'icon' => 'Databases',
+ ],
+ [
'help' => [
'url' => 'help.php',
'url-params' => [
'help' => 'pg.role',
- 'server' => $serverId
- ]
- ]
- ],
- [
+ 'server' => $serverId,
+ ],
+ ],
+ 'icon' => 'Roles',
+ 'label' => _('Roles'),
'url' => 'roles.php',
'url-params' => [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
],
- 'label' => _('Roles'),
- 'icon' => 'Roles',
+ ],
+ [
'help' => [
'url' => 'help.php',
'url-params' => [
- 'help' => 'pg.role',
- 'server' => $serverId
- ]
- ]
- ],
- [
+ 'help' => 'pg.tablespace',
+ 'server' => $serverId,
+ ],
+ ],
+ 'icon' => 'Tablespaces',
+ 'label' => _('Tablespaces'),
'url' => 'tablespaces.php',
'url-params' => [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
],
- 'label' => _('Tablespaces'),
- 'icon' => 'Tablespaces',
- 'help' => [
- 'url' => 'help.php',
- 'url-params' => [
- 'help' => 'pg.tablespace',
- 'server' => $serverId
- ]
- ]
],
[
+ 'active' => true,
+ 'icon' => 'Export',
+ 'label' => _('Export'),
'url' => 'all_db_export.php',
'url-params' => [
- 'server' => $serverId
+ 'server' => $serverId,
],
- 'active' => true,
- 'label' => _('Export'),
- 'icon' => 'Export',
- ]
+ ],
];
$body->appendChild(WebsiteComponents::buildServerDatabasesTabs($dom, $tabLinks));
diff --git a/src/Website/AlterDb.php b/src/Website/AlterDb.php
index cd0ccfb54..588c7f37f 100644
--- a/src/Website/AlterDb.php
+++ b/src/Website/AlterDb.php
@@ -8,7 +8,7 @@
use PhpPgAdmin\DDD\Entities\ServerSession;
use PhpPgAdmin\DDD\ValueObjects\TrailSubject;
-class AlterDb extends Website
+final class AlterDb extends Website
{
private string $message = '';
@@ -40,8 +40,8 @@ public function __construct()
if (!headers_sent()) {
$redirectUrl = 'all_db.php';
$redirectUrlParams = [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
];
header('Location: ' . $redirectUrl . '?' . http_build_query($redirectUrlParams));
@@ -72,7 +72,7 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
url: 'help.php',
urlParams: [
'help' => 'pg.database.alter',
- 'server' => $serverId
+ 'server' => $serverId,
]
);
$h2->appendChild($aHelp);
@@ -180,8 +180,8 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
$inputCancel->setAttribute('class', 'button');
$cancelUrl = 'all_db.php';
$cancelUrlParams = [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
];
$inputCancel->setAttribute('href', $cancelUrl . '?' . http_build_query($cancelUrlParams));
$form->appendChild($dom->createEntityReference('nbsp'));
diff --git a/src/Website/Browser.php b/src/Website/Browser.php
index 65405aa20..8a4880fc5 100644
--- a/src/Website/Browser.php
+++ b/src/Website/Browser.php
@@ -6,17 +6,17 @@
use PhpPgAdmin\{Config, Website};
-class Browser extends Website
+final class Browser extends Website
{
public function __construct()
{
parent::__construct();
$this->scripts['xloadtree/xtree2'] = [
- 'src' => 'xloadtree/xtree2.js'
+ 'src' => 'xloadtree/xtree2.js',
];
$this->scripts['xloadtree/xloadtree2'] = [
- 'src' => 'xloadtree/xloadtree2.js'
+ 'src' => 'xloadtree/xloadtree2.js',
];
}
diff --git a/src/Website/CreateDb.php b/src/Website/CreateDb.php
index 4d4568cf7..8dc8377dc 100644
--- a/src/Website/CreateDb.php
+++ b/src/Website/CreateDb.php
@@ -9,7 +9,7 @@
use PhpPgAdmin\DDD\Entities\ServerSession;
use PhpPgAdmin\DDD\ValueObjects\TrailSubject;
-class CreateDb extends Website
+final class CreateDb extends Website
{
private string $message = '';
@@ -37,8 +37,8 @@ public function __construct()
if (!headers_sent()) {
$redirectUrl = 'all_db.php';
$redirectUrlParams = [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
];
header('Location: ' . $redirectUrl . '?' . http_build_query($redirectUrlParams));
die();
@@ -68,7 +68,7 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
url: 'help.php',
urlParams: [
'help' => 'pg.database.create',
- 'server' => $serverId
+ 'server' => $serverId,
]
);
$h2->appendChild($aHelp);
@@ -285,8 +285,8 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
$inputCancel->setAttribute('class', 'button');
$cancelUrl = 'all_db.php';
$cancelUrlParams = [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
];
$inputCancel->setAttribute('href', $cancelUrl . '?' . http_build_query($cancelUrlParams));
diff --git a/src/Website/DropDb.php b/src/Website/DropDb.php
index 37b1931e0..4ba05ed64 100644
--- a/src/Website/DropDb.php
+++ b/src/Website/DropDb.php
@@ -8,7 +8,7 @@
use PhpPgAdmin\DDD\Entities\ServerSession;
use PhpPgAdmin\DDD\ValueObjects\TrailSubject;
-class DropDb extends Website
+final class DropDb extends Website
{
public function __construct()
{
@@ -21,8 +21,8 @@ public function __construct()
if (!is_null($serverSession) && !empty($database)) {
$redirectUrl = 'all_db.php';
$redirectUrlParams = [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
];
$db = $serverSession->getDatabaseConnection();
@@ -57,7 +57,7 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
url: 'help.php',
urlParams: [
'help' => 'pg.database.drop',
- 'server' => $serverId
+ 'server' => $serverId,
]
);
$h2->appendChild($aHelp);
@@ -85,8 +85,8 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
$aButtonCancel->setAttribute('class', 'button');
$cancelUrl = 'all_db.php';
$cancelUrlParams = [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
];
$aButtonCancel->setAttribute('href', $cancelUrl . '?' . http_build_query($cancelUrlParams));
diff --git a/src/Website/Exception.php b/src/Website/Exception.php
index ab29356b4..29b565ca6 100644
--- a/src/Website/Exception.php
+++ b/src/Website/Exception.php
@@ -7,12 +7,23 @@
use Locr\Lib\HTTP\StatusCode;
use PhpPgAdmin\Website;
-class Exception extends Website
+final class Exception extends Website
{
public function __construct(private \Throwable $exception)
{
}
+ public static function handle(\Throwable $exception): void
+ {
+ $exceptionCode = $exception->getCode();
+ if (is_int($exceptionCode)) {
+ $statusCode = StatusCode::tryFrom($exceptionCode) ?? StatusCode::InternalServerError;
+ header($statusCode->buildHeader());
+ }
+ $website = new self($exception);
+ print $website->buildHtmlString();
+ }
+
protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
{
$body = parent::buildHtmlBody($dom);
@@ -25,15 +36,4 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
return $body;
}
-
- public static function handle(\Throwable $exception): void
- {
- $exceptionCode = $exception->getCode();
- if (is_int($exceptionCode)) {
- $statusCode = StatusCode::tryFrom($exceptionCode) ?? StatusCode::InternalServerError;
- header($statusCode->buildHeader());
- }
- $website = new self($exception);
- print $website->buildHtmlString();
- }
}
diff --git a/src/Website/Index.php b/src/Website/Index.php
index e7b788d2a..ec898c6bf 100644
--- a/src/Website/Index.php
+++ b/src/Website/Index.php
@@ -6,7 +6,7 @@
use PhpPgAdmin\{Config, Website};
-class Index extends Website
+final class Index extends Website
{
protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
{
diff --git a/src/Website/Intro.php b/src/Website/Intro.php
index d90cd8b7f..be0bc6056 100644
--- a/src/Website/Intro.php
+++ b/src/Website/Intro.php
@@ -6,7 +6,7 @@
use PhpPgAdmin\{Config, Language, RequestParameter, Themes, Website, WebsiteComponents};
-class Intro extends Website
+final class Intro extends Website
{
protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
{
diff --git a/src/Website/Login.php b/src/Website/Login.php
index e0096851f..5e98d3857 100644
--- a/src/Website/Login.php
+++ b/src/Website/Login.php
@@ -7,7 +7,7 @@
use PhpPgAdmin\{Config, RequestParameter, Website, WebsiteComponents};
use PhpPgAdmin\Database\PhpPgAdminConnection;
-class Login extends Website
+final class Login extends Website
{
private string $message = '';
@@ -57,21 +57,21 @@ public function __construct()
$_SESSION['webdbLogin'] = [];
}
$_SESSION['webdbLogin'][$loginServer] = [
+ 'defaultdb' => (string)$server->DefaultDb,
'desc' => (string)$server->Name,
'host' => (string)$server->Host,
+ 'password' => $loginPassword,
+ 'pg_dumpall_path' => '/usr/bin/pg_dumpall',
+ 'pg_dump_path' => '/usr/bin/pg_dump',
+ //'pgVersion' => $server->Version->Value,
+ //'platform' => 'PostgreSQL ' . $server->Version->Value,
'port' => $server->Port->Value,
'sslmode' => $server->SslMode->value,
- 'defaultdb' => (string)$server->DefaultDb,
- 'pg_dump_path' => '/usr/bin/pg_dump',
- 'pg_dumpall_path' => '/usr/bin/pg_dumpall',
'username' => $loginUsername,
- 'password' => $loginPassword,
- //'platform' => 'PostgreSQL ' . $server->Version->Value,
- //'pgVersion' => $server->Version->Value
];
$redirectLocationUrlParams = [
- 'server' => $loginServer
+ 'server' => $loginServer,
];
header('Location: ./all_db.php?' . http_build_query($redirectLocationUrlParams));
exit;
diff --git a/src/Website/Redirect.php b/src/Website/Redirect.php
index ffc96c354..59de0bc37 100644
--- a/src/Website/Redirect.php
+++ b/src/Website/Redirect.php
@@ -8,8 +8,28 @@
use PhpPgAdmin\{Config, RequestParameter, Website};
use PhpPgAdmin\DDD\Entities\ServerSession;
-class Redirect extends Website
+final class Redirect extends Website
{
+ public function tryRedirect(): void
+ {
+ $subject = RequestParameter::getString('subject');
+ if (is_null($subject)) {
+ throw new \InvalidArgumentException(
+ 'Missing required parameter: subject',
+ StatusCode::BadRequest->value
+ );
+ }
+
+ match ($subject) {
+ 'root' => $this->redirectToRoot(),
+ 'server' => $this->redirectToServer(),
+ default => trigger_error(
+ 'Redirecting subject ("' . $subject . '") not found the new way. Continue the old way!',
+ E_USER_DEPRECATED
+ )
+ };
+ }
+
private function redirectToRoot(): void
{
$locationUrl = './intro.php';
@@ -33,8 +53,8 @@ private function redirectToServer(): void
$locationUrl = './login.php';
$locationUrlParams = [
+ 'server' => $server,
'subject' => 'server',
- 'server' => $server
];
if (ServerSession::isLoggedIn($server)) {
@@ -47,24 +67,4 @@ private function redirectToServer(): void
header('Location: ' . $locationUrl);
exit;
}
-
- public function tryRedirect(): void
- {
- $subject = RequestParameter::getString('subject');
- if (is_null($subject)) {
- throw new \InvalidArgumentException(
- 'Missing required parameter: subject',
- StatusCode::BadRequest->value
- );
- }
-
- match ($subject) {
- 'root' => $this->redirectToRoot(),
- 'server' => $this->redirectToServer(),
- default => trigger_error(
- 'Redirecting subject ("' . $subject . '") not found the new way. Continue the old way!',
- E_USER_DEPRECATED
- )
- };
- }
}
diff --git a/src/Website/ServerLogout.php b/src/Website/ServerLogout.php
index 562d0cdb3..845ad1545 100644
--- a/src/Website/ServerLogout.php
+++ b/src/Website/ServerLogout.php
@@ -6,7 +6,7 @@
use PhpPgAdmin\{RequestParameter, Website};
-class ServerLogout extends Website
+final class ServerLogout extends Website
{
public function __construct()
{
diff --git a/src/Website/Servers.php b/src/Website/Servers.php
index bacaa0c27..db620dd29 100644
--- a/src/Website/Servers.php
+++ b/src/Website/Servers.php
@@ -6,7 +6,7 @@
use PhpPgAdmin\{Config, Website, WebsiteComponents};
-class Servers extends Website
+final class Servers extends Website
{
public function __construct()
{
@@ -57,8 +57,8 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
$a = $dom->createElement('a', (string)$server->Name);
$serverId = $server->id();
$redirectUrlParams = [
+ 'server' => $serverId,
'subject' => 'server',
- 'server' => $serverId
];
$redirectUrl = 'redirect.php?' . http_build_query($redirectUrlParams);
$a->setAttribute('href', $redirectUrl);
@@ -84,7 +84,7 @@ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
$td->setAttribute('class', 'opbutton' . ($index + 1));
$a = $dom->createElement('a', _('Logout'));
$logoutUrlParams = [
- 'id' => $serverId
+ 'id' => $serverId,
];
$logoutUrl = 'server-logout.php?' . http_build_query($logoutUrlParams);
$a->setAttribute('href', $logoutUrl);
diff --git a/src/Website/SqlEdit.php b/src/Website/SqlEdit.php
new file mode 100644
index 000000000..2f1f0b3c2
--- /dev/null
+++ b/src/Website/SqlEdit.php
@@ -0,0 +1,322 @@
+scripts['sqledit'] = [
+ 'src' => 'js/sqledit.js',
+ ];
+ }
+
+ protected function buildHtmlBody(\DOMDocument $dom): \DOMElement
+ {
+ $body = parent::buildHtmlBody($dom);
+
+ $serverId = RequestParameter::getString('server') ?? '';
+ $actionParam = RequestParameter::getString('action');
+ $tabLinks = [
+ [
+ 'active' => !is_null($actionParam) && $actionParam === 'sql',
+ 'help' => [
+ 'url' => 'help.php',
+ 'url-params' => [
+ 'help' => 'pg.sql',
+ 'server' => $serverId,
+ ],
+ ],
+ 'icon' => 'SqlEditor',
+ 'label' => _('SQL'),
+ 'url' => 'sqledit.php',
+ 'url-params' => [
+ 'action' => 'sql',
+ 'server' => $serverId,
+ 'subject' => 'schema',
+ ],
+ ],
+ [
+ 'active' => !is_null($actionParam) && $actionParam === 'find',
+ 'icon' => 'Search',
+ 'label' => _('Find'),
+ 'url' => 'sqledit.php',
+ 'url-params' => [
+ 'action' => 'find',
+ 'server' => $serverId,
+ 'subject' => 'schema',
+ ],
+ ],
+ ];
+ $body->appendChild(WebsiteComponents::buildServerDatabasesTabs($dom, $tabLinks));
+
+ $actionParam = RequestParameter::getString('action') ?? '';
+
+ $formAction = match ($actionParam) {
+ 'find' => 'database.php',
+ 'sql' => 'sql.php',
+ default => 'sql.php',
+ };
+
+ $form = $dom->createElement('form');
+ $form->setAttribute('action', $formAction);
+ $form->setAttribute('method', 'post');
+ $form->setAttribute('enctype', 'multipart/form-data');
+ $form->setAttribute('target', 'detail');
+
+ $table = $dom->createElement('table');
+ $table->setAttribute('style', 'width: 100%;');
+ $tBody = $dom->createElement('tbody');
+
+ $tr = $dom->createElement('tr');
+
+ $tdServerSelection = $dom->createElement('td');
+ $labelForServer = $dom->createElement('label');
+ $labelForServer->setAttribute('for', 'server');
+ $labelForServer->appendChild($dom->createTextNode(_('Server')));
+ $helpLink = WebsiteComponents::buildHelpLink(
+ dom: $dom,
+ url: 'help.php',
+ urlParams: [
+ 'help' => 'pg.server',
+ 'server' => $serverId,
+ ]
+ );
+ $labelForServer->appendChild($helpLink);
+ $tdServerSelection->appendChild($labelForServer);
+ $tdServerSelection->appendChild($dom->createTextNode(': '));
+ $serverSelection = $dom->createElement('select');
+ $serverSelection->setAttribute('name', 'server');
+ $serverSelection->setAttribute('id', 'server');
+ $serverSelection->setAttribute('onchange', 'changeServer(event)');
+ $servers = Config::getServers();
+ foreach ($servers as $server) {
+ $option = $dom->createElement('option');
+ $option->setAttribute('value', $server->id());
+ if ($server->id() === $serverId) {
+ $option->setAttribute('selected', 'selected');
+ }
+ $option->appendChild($dom->createTextNode($server->Name . ' (' . $server->id() . ')'));
+ $serverSelection->appendChild($option);
+ }
+ $tdServerSelection->appendChild($serverSelection);
+
+ $tdDatabaseSelection = $dom->createElement('td');
+ $tdDatabaseSelection->setAttribute('style', 'text-align: right;');
+ $labelForDatabase = $dom->createElement('label');
+ $labelForDatabase->setAttribute('for', 'database');
+ $labelForDatabase->appendChild($dom->createTextNode(_('Database')));
+ $helpLink = WebsiteComponents::buildHelpLink(
+ dom: $dom,
+ url: 'help.php',
+ urlParams: [
+ 'help' => 'pg.database',
+ 'server' => $serverId,
+ ]
+ );
+ $labelForDatabase->appendChild($helpLink);
+ $labelForDatabase->appendChild($dom->createTextNode(': '));
+ $tdDatabaseSelection->appendChild($labelForDatabase);
+ $databaseSelection = $dom->createElement('select');
+ $databaseSelection->setAttribute('name', 'database');
+ $databaseSelection->setAttribute('id', 'database');
+ $databaseSelection->setAttribute('onchange', 'changeServer(event)');
+ $emptyOption = $dom->createElement('option', '--');
+ $emptyOption->setAttribute('value', '');
+ $databaseSelection->appendChild($emptyOption);
+ $serverSession = ServerSession::fromServerId($serverId);
+ if (!is_null($serverSession)) {
+ $databaseParam = RequestParameter::getString('database');
+
+ $db = $serverSession->getDatabaseConnection();
+ $dbs = $db->getDatabases();
+ foreach ($dbs as $dbMetaData) {
+ $option = $dom->createElement('option');
+ $option->setAttribute('value', $dbMetaData['datname']);
+ if ($dbMetaData['datname'] === $databaseParam) {
+ $option->setAttribute('selected', 'selected');
+ }
+ $option->appendChild($dom->createTextNode($dbMetaData['datname']));
+ $databaseSelection->appendChild($option);
+ }
+ }
+ $tdDatabaseSelection->appendChild($databaseSelection);
+
+ $tr->appendChild($tdServerSelection);
+ $tr->appendChild($tdDatabaseSelection);
+
+ $tBody->appendChild($tr);
+ $table->appendChild($tBody);
+
+ $form->appendChild($table);
+
+ match ($actionParam) {
+ 'find' => $this->appendFindPart($form),
+ 'sql' => $this->appendSqlPart($form, $serverId),
+ default => throw new \InvalidArgumentException("Unknown action: {$actionParam}"),
+ };
+
+ $body->appendChild($form);
+
+ return $body;
+ }
+
+ private function appendFindPart(\DOMElement $element): void
+ {
+ $dom = $element->ownerDocument;
+ if (is_null($dom)) {
+ throw new \RuntimeException('DOMDocument is not set for the element.');
+ }
+
+ $pFind = $dom->createElement('p');
+
+ $inputTerm = $dom->createElement('input');
+ $inputTerm->setAttribute('name', 'term');
+ $inputTerm->setAttribute('id', 'term');
+ $inputTerm->setAttribute('value', '');
+ $inputTerm->setAttribute('size', '32');
+ $inputTerm->setAttribute('maxlength', '63');
+
+ $filterSelection = $dom->createElement('select');
+ $filterSelection->setAttribute('name', 'filter');
+ $filterSelection->setAttribute('id', 'filter');
+ $filterArray = [
+ '' => _('All objects'),
+ 'COLUMN' => _('Columns'),
+ 'CONSTRAINT' => _('Constraints'),
+ 'DOMAIN' => _('Domains'),
+ 'FUNCTION' => _('Functions'),
+ 'INDEX' => _('Indexes'),
+ 'RULE' => _('Rules'),
+ 'SCHEMA' => _('Schemas'),
+ 'SEQUENCE' => _('Sequences'),
+ 'TABLE' => _('Tables'),
+ 'TRIGGER' => _('Triggers'),
+ 'VIEW' => _('Views'),
+ ];
+ foreach ($filterArray as $key => $value) {
+ $option = $dom->createElement('option');
+ $option->setAttribute('value', $key);
+ $option->appendChild($dom->createTextNode($value));
+ $filterSelection->appendChild($option);
+ }
+
+ $inputSubmit = $dom->createElement('input');
+ $inputSubmit->setAttribute('type', 'submit');
+ $inputSubmit->setAttribute('value', _('Find'));
+
+ $inputAction = $dom->createElement('input');
+ $inputAction->setAttribute('type', 'hidden');
+ $inputAction->setAttribute('name', 'action');
+ $inputAction->setAttribute('value', 'find');
+ $pFind->appendChild($inputAction);
+
+ $pFind->appendChild($inputTerm);
+ $pFind->appendChild($dom->createTextNode(' '));
+ $pFind->appendChild($filterSelection);
+ $pFind->appendChild($dom->createTextNode(' '));
+ $pFind->appendChild($inputSubmit);
+ $pFind->appendChild($inputAction);
+
+ $element->appendChild($pFind);
+ }
+
+ private function appendSqlPart(\DOMElement $element, string $serverId): void
+ {
+ $dom = $element->ownerDocument;
+ if (is_null($dom)) {
+ throw new \RuntimeException('DOMDocument is not set for the element.');
+ }
+
+ $pSchemaSearchPath = $dom->createElement('p');
+ $labelForSearchPath = $dom->createElement('label');
+ $labelForSearchPath->setAttribute('for', 'search_path');
+ $labelForSearchPath->appendChild($dom->createTextNode(_('Schema search path')));
+ $pSchemaSearchPath->appendChild($labelForSearchPath);
+ $searchPathHelp = WebsiteComponents::buildHelpLink(
+ dom: $dom,
+ url: 'help.php',
+ urlParams: [
+ 'help' => 'pg.schema.search_path',
+ 'server' => $serverId,
+ ]
+ );
+ $pSchemaSearchPath->appendChild($searchPathHelp);
+ $pSchemaSearchPath->appendChild($dom->createTextNode(': '));
+ $inputSearchPath = $dom->createElement('input');
+ $inputSearchPath->setAttribute('type', 'text');
+ $inputSearchPath->setAttribute('name', 'search_path');
+ $inputSearchPath->setAttribute('id', 'search_path');
+ $inputSearchPath->setAttribute('size', '50');
+ $searchPathParam = RequestParameter::getString('search_path') ?? 'public';
+ $inputSearchPath->setAttribute('value', $searchPathParam);
+ $pSchemaSearchPath->appendChild($inputSearchPath);
+
+ $textareaQuery = $dom->createElement('textarea');
+ $textareaQuery->setAttribute('style', 'width: 98%;');
+ $textareaQuery->setAttribute('rows', '10');
+ $textareaQuery->setAttribute('cols', '50');
+ $textareaQuery->setAttribute('name', 'query');
+ $textareaQuery->setAttribute('id', 'query');
+ $queryParam = RequestParameter::getString('query') ?? '';
+ $textareaQuery->appendChild($dom->createTextNode($queryParam));
+
+ $pUpload = $dom->createElement('p');
+ $inputMaxFileSize = $dom->createElement('input');
+ $inputMaxFileSize->setAttribute('type', 'hidden');
+ $inputMaxFileSize->setAttribute('name', 'MAX_FILE_SIZE');
+ $inputMaxFileSize->setAttribute('value', '2097152');
+ $labelForScript = $dom->createElement('label');
+ $labelForScript->setAttribute('for', 'script');
+ $labelForScript->appendChild($dom->createTextNode(_('or upload an SQL script:')));
+ $labelForScript->appendChild($dom->createTextNode(' '));
+ $inputScript = $dom->createElement('input');
+ $inputScript->setAttribute('id', 'script');
+ $inputScript->setAttribute('name', 'script');
+ $inputScript->setAttribute('type', 'file');
+ $pUpload->appendChild($inputMaxFileSize);
+ $pUpload->appendChild($labelForScript);
+ $pUpload->appendChild($inputScript);
+
+ $pPaginate = $dom->createElement('p');
+ $inputPaginate = $dom->createElement('input');
+ $inputPaginate->setAttribute('type', 'checkbox');
+ $inputPaginate->setAttribute('id', 'paginate');
+ $inputPaginate->setAttribute('name', 'paginate');
+ $labelForPaginate = $dom->createElement('label');
+ $labelForPaginate->setAttribute('for', 'paginate');
+ $labelForPaginate->appendChild($dom->createTextNode(_('Paginate results')));
+ $pPaginate->appendChild($inputPaginate);
+ $pPaginate->appendChild($dom->createTextNode(' '));
+ $pPaginate->appendChild($labelForPaginate);
+
+ $pButtons = $dom->createElement('p');
+ $inputExecute = $dom->createElement('input');
+ $inputExecute->setAttribute('type', 'submit');
+ $inputExecute->setAttribute('name', 'execute');
+ $inputExecute->setAttribute('accesskey', 'r');
+ $inputExecute->setAttribute('value', _('Execute'));
+ $inputReset = $dom->createElement('input');
+ $inputReset->setAttribute('type', 'reset');
+ $inputReset->setAttribute('accesskey', 'q');
+ $inputReset->setAttribute('value', _('Reset'));
+ $pButtons->appendChild($inputExecute);
+ $pButtons->appendChild($dom->createTextNode(' '));
+ $pButtons->appendChild($inputReset);
+
+ $element->appendChild($pSchemaSearchPath);
+ $element->appendChild($textareaQuery);
+ $element->appendChild($pUpload);
+ $element->appendChild($pPaginate);
+ $element->appendChild($pButtons);
+ }
+}
diff --git a/src/WebsiteComponents.php b/src/WebsiteComponents.php
index 00dcc7133..af8aa26c9 100644
--- a/src/WebsiteComponents.php
+++ b/src/WebsiteComponents.php
@@ -86,9 +86,9 @@ public static function buildDatabasesTable(\DOMDocument $dom, ?ServerSession $se
$aDatabase = $dom->createElement('a', $dbName);
$dbUrl = 'redirect.php';
$dbUrlParams = [
- 'subject' => 'database',
+ 'database' => $dbName,
'server' => $serverSession?->id() ?? '',
- 'database' => $dbName
+ 'subject' => 'database',
];
$aDatabase->setAttribute('href', $dbUrl . '?' . http_build_query($dbUrlParams));
$tdDatabase->appendChild($aDatabase);
@@ -106,7 +106,7 @@ public static function buildDatabasesTable(\DOMDocument $dom, ?ServerSession $se
$deleteUrl = 'drop_db.php';
$deleteUrlParams = [
'database' => $dbName,
- 'server' => $serverSession?->id() ?? ''
+ 'server' => $serverSession?->id() ?? '',
];
$aDelete->setAttribute('href', $deleteUrl . '?' . http_build_query($deleteUrlParams));
$aDelete->appendChild($dom->createTextNode(_('Delete')));
@@ -117,9 +117,9 @@ public static function buildDatabasesTable(\DOMDocument $dom, ?ServerSession $se
$aPrivileges = $dom->createElement('a');
$privilegesUrl = 'privileges.php';
$privilegesUrlParams = [
- 'subject' => 'database',
'dropdatabase' => $dbName,
- 'server' => $serverSession?->id() ?? ''
+ 'server' => $serverSession?->id() ?? '',
+ 'subject' => 'database',
];
$aPrivileges->setAttribute('href', $privilegesUrl . '?' . http_build_query($privilegesUrlParams));
$aPrivileges->appendChild($dom->createTextNode(_('Privileges')));
@@ -131,7 +131,7 @@ public static function buildDatabasesTable(\DOMDocument $dom, ?ServerSession $se
$alterUrl = 'alter_db.php';
$alterUrlParams = [
'database' => $dbName,
- 'server' => $serverSession?->id() ?? ''
+ 'server' => $serverSession?->id() ?? '',
];
$aAlter->setAttribute('href', $alterUrl . '?' . http_build_query($alterUrlParams));
$aAlter->appendChild($dom->createTextNode(_('Alter')));
@@ -374,7 +374,7 @@ public static function buildServerDatabasesTabs(\DOMDocument $dom, array $tabLin
$td->appendChild($a);
if (isset($tabLink['help'])) {
- $aHelp = WebsiteComponents::buildHelpLink(
+ $aHelp = self::buildHelpLink(
dom: $dom,
url: $tabLink['help']['url'],
urlParams: $tabLink['help']['url-params'] ?? []
@@ -458,70 +458,6 @@ public static function buildTopBar(\DOMDocument $dom): \DOMElement
return $divWrapper;
}
- private static function buildTopBarLinks(\DOMDocument $dom, ServerSession $serverSession): \DOMElement
- {
- $tableCell = $dom->createElement('td');
- $tableCell->setAttribute('style', 'text-align: right;');
-
- $ulTopLinks = $dom->createElement('ul');
- $ulTopLinks->setAttribute('class', 'toplink');
-
- $topLinks = [
- 'sql' => [
- 'text' => _('SQL'),
- 'url' => 'sqledit.php',
- 'url-params' => [
- 'subject' => 'table',
- 'server' => $serverSession->id(),
- 'action' => 'sql'
- ],
- 'target' => 'sqledit'
- ],
- 'history' => [
- 'text' => _('History'),
- 'url' => 'history.php',
- 'url-params' => [
- 'subject' => 'table',
- 'server' => $serverSession->id(),
- 'action' => 'pophistory'
- ],
- ],
- 'find' => [
- 'text' => _('Find'),
- 'url' => 'sqledit.php',
- 'url-params' => [
- 'subject' => 'table',
- 'server' => $serverSession->id(),
- 'action' => 'find'
- ],
- 'target' => 'sqledit'
- ],
- 'logout' => [
- 'text' => _('Logout'),
- 'url' => 'server-logout.php',
- 'url-params' => [
- 'id' => $serverSession->id()
- ]
- ]
- ];
-
- foreach ($topLinks as $key => $link) {
- $li = $dom->createElement('li');
- $a = $dom->createElement('a', $link['text']);
- $a->setAttribute('href', $link['url'] . '?' . http_build_query($link['url-params']));
- if (isset($link['target'])) {
- $a->setAttribute('target', $link['target']);
- }
- $a->setAttribute('id', 'toplink_' . $key);
- $li->appendChild($a);
- $ulTopLinks->appendChild($li);
- }
-
- $tableCell->appendChild($ulTopLinks);
-
- return $tableCell;
- }
-
public static function buildTrail(\DOMDocument $dom, ?TrailSubject $subject = null): \DOMElement
{
$divTrail = $dom->createElement('div');
@@ -560,6 +496,69 @@ public static function buildTrail(\DOMDocument $dom, ?TrailSubject $subject = nu
return $divTrail;
}
+ private static function buildTopBarLinks(\DOMDocument $dom, ServerSession $serverSession): \DOMElement
+ {
+ $tableCell = $dom->createElement('td');
+ $tableCell->setAttribute('style', 'text-align: right;');
+
+ $ulTopLinks = $dom->createElement('ul');
+ $ulTopLinks->setAttribute('class', 'toplink');
+
+ $topLinks = [];
+ $topLinks['sql'] = [
+ 'target' => 'sqledit',
+ 'text' => _('SQL'),
+ 'url' => 'sqledit.php',
+ 'url-params' => [
+ 'action' => 'sql',
+ 'server' => $serverSession->id(),
+ 'subject' => 'table',
+ ],
+ ];
+ $topLinks['history'] = [
+ 'text' => _('History'),
+ 'url' => 'history.php',
+ 'url-params' => [
+ 'action' => 'pophistory',
+ 'server' => $serverSession->id(),
+ 'subject' => 'table',
+ ],
+ ];
+ $topLinks['find'] = [
+ 'target' => 'sqledit',
+ 'text' => _('Find'),
+ 'url' => 'sqledit.php',
+ 'url-params' => [
+ 'action' => 'find',
+ 'server' => $serverSession->id(),
+ 'subject' => 'table',
+ ],
+ ];
+ $topLinks['logout'] = [
+ 'text' => _('Logout'),
+ 'url' => 'server-logout.php',
+ 'url-params' => [
+ 'id' => $serverSession->id(),
+ ],
+ ];
+
+ foreach ($topLinks as $key => $link) {
+ $li = $dom->createElement('li');
+ $a = $dom->createElement('a', $link['text']);
+ $a->setAttribute('href', $link['url'] . '?' . http_build_query($link['url-params']));
+ if (isset($link['target'])) {
+ $a->setAttribute('target', $link['target']);
+ }
+ $a->setAttribute('id', 'toplink_' . $key);
+ $li->appendChild($a);
+ $ulTopLinks->appendChild($li);
+ }
+
+ $tableCell->appendChild($ulTopLinks);
+
+ return $tableCell;
+ }
+
private static function buildTrailForServer(\DOMDocument $dom): \DOMElement
{
$td = $dom->createElement('td');
@@ -569,7 +568,7 @@ private static function buildTrailForServer(\DOMDocument $dom): \DOMElement
$serverSession = ServerSession::fromServerId($serverId);
$link = 'all_db.php';
$linkParams = [
- 'server' => $serverId
+ 'server' => $serverId,
];
$a = $dom->createElement('a');
$a->setAttribute('href', $link . '?' . http_build_query($linkParams));
@@ -590,12 +589,12 @@ private static function buildTrailForServer(\DOMDocument $dom): \DOMElement
$td->appendChild($a);
- $aHelp = WebsiteComponents::buildHelpLink(
+ $aHelp = self::buildHelpLink(
dom: $dom,
url: 'help.php',
urlParams: [
'help' => 'pg.server',
- 'server' => $serverId
+ 'server' => $serverId,
]
);
$td->appendChild($aHelp);