From ab7c91a59bbcdaf54d01192fa1d7595144289023 Mon Sep 17 00:00:00 2001 From: popcorner Date: Wed, 5 Sep 2018 08:44:24 +0000 Subject: [PATCH 1/7] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (3294 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/ Signed-off-by: popcorner --- po/zh_CN.po | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 665a5c950f..a1cca4e671 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-08-26 19:06+0200\n" -"PO-Revision-Date: 2018-08-02 07:35+0000\n" -"Last-Translator: H Zeng \n" +"PO-Revision-Date: 2018-09-06 02:54+0000\n" +"Last-Translator: popcorner \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_CN\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 3.1.1\n" +"X-Generator: Weblate 3.2-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1101 msgid "Bad type!" @@ -902,7 +902,7 @@ msgstr "您已修改了一些数据但尚未保存。您真的要放弃保存并 msgid "" "You are trying to reduce the number of rows, but have already entered data " "in those rows which will be lost. Do you wish to continue?" -msgstr "" +msgstr "您正在尝试减少行数，但那些行中已经输入了数据，这些数据即将丢失。你想继续吗？" #: js/messages.php:75 msgid "Do you really want to revoke the selected user(s) ?" @@ -2207,7 +2207,7 @@ msgstr "尚未保存当前布局。如果继续将会丢失本次的修改。是 #: js/messages.php:562 msgid "value/subQuery is empty" -msgstr "" +msgstr "值/子查询为空" #: js/messages.php:563 templates/database/designer/side_menu.twig:34 #: templates/database/designer/side_menu.twig:37 @@ -9652,7 +9652,7 @@ msgstr "将文本以 XML 语法高亮显示。" msgid "" "The gd PHP extension was not found. The QRcode can not be displayed without " "the gd PHP extension." -msgstr "" +msgstr "找不到gd PHP扩展。没有gd PHP扩展，无法显示二维码（QRcode）。" #: libraries/classes/Plugins/TwoFactor/Application.php:146 msgid "Authentication Application (2FA)" @@ -13755,24 +13755,18 @@ msgstr "" "码。" #: templates/login/twofactor/application_configure.twig:11 -#, fuzzy -#| msgid "" -#| "Please scan following QR code into the two-factor authentication app on " -#| "your device and enter authentication code it generates." msgid "" "Please enter following secret/key into the two-factor authentication app on " "your device and enter authentication code it generates." -msgstr "" -"请将以下QR码扫描到设备上的双因素身份验证应用程序中，然后输入它生成的身份验证" -"码。" +msgstr "请将以下密钥输入到设备上的双因素身份验证应用程序中，然后输入它生成的身份验证码。" #: templates/login/twofactor/application_configure.twig:14 msgid "OTP url:" -msgstr "" +msgstr "一次性密码（OTP） url:" #: templates/login/twofactor/application_configure.twig:18 msgid "Secret/key:" -msgstr "" +msgstr "密钥：" #: templates/login/twofactor/application_configure.twig:21 #: templates/login/twofactor/application.twig:2 From 399a095bb43b426b25908c437b4a63ef39d4a620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BE=D0=BB=D0=BE=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20?= =?UTF-8?q?=D0=91=D1=80=D0=B8=D0=BD=D1=8F=D0=BA?= Date: Sun, 9 Sep 2018 06:39:53 +0000 Subject: [PATCH 2/7] Translated using Weblate (Ukrainian) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (3294 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/uk/ Signed-off-by: Володимир Бриняк --- po/uk.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/uk.po b/po/uk.po index a0f753fbae..a3e6840a72 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-08-26 19:06+0200\n" -"PO-Revision-Date: 2018-09-04 18:24+0000\n" +"PO-Revision-Date: 2018-09-10 07:27+0000\n" "Last-Translator: Володимир Бриняк \n" "Language-Team: Ukrainian \n" @@ -2283,7 +2283,7 @@ msgstr "" #: js/messages.php:562 msgid "value/subQuery is empty" -msgstr "" +msgstr "значення/підзапит пусті" #: js/messages.php:563 templates/database/designer/side_menu.twig:34 #: templates/database/designer/side_menu.twig:37 @@ -10112,6 +10112,8 @@ msgid "" "The gd PHP extension was not found. The QRcode can not be displayed without " "the gd PHP extension." msgstr "" +"Розширення gd PHP не знайдено. QR-код не може відображатися без gd PHP " +"розширення." #: libraries/classes/Plugins/TwoFactor/Application.php:146 msgid "Authentication Application (2FA)" @@ -14427,24 +14429,21 @@ msgstr "" "пристрої та введіть код, який він генерує." #: templates/login/twofactor/application_configure.twig:11 -#, fuzzy -#| msgid "" -#| "Please scan following QR code into the two-factor authentication app on " -#| "your device and enter authentication code it generates." msgid "" "Please enter following secret/key into the two-factor authentication app on " "your device and enter authentication code it generates." msgstr "" -"Перегляньте QR-код у застосунку із двофакторною автентифікацією на своєму " -"пристрої та введіть код, який він генерує." +"Будь-ласка, введіть нижченаведений секрет/ключ у застосунку із двофакторною " +"автентифікацією на своєму пристрої і введіть код автентифікації, який він " +"згенерує." #: templates/login/twofactor/application_configure.twig:14 msgid "OTP url:" -msgstr "" +msgstr "OTP url:" #: templates/login/twofactor/application_configure.twig:18 msgid "Secret/key:" -msgstr "" +msgstr "Секрет/ключ:" #: templates/login/twofactor/application_configure.twig:21 #: templates/login/twofactor/application.twig:2 @@ -15860,7 +15859,7 @@ msgstr "Вибрати сторінку" #: templates/database/structure/check_all_tables.twig:6 msgid "Check tables having overhead" -msgstr "Перевірити чи мають таблиці накладні витрати" +msgstr "Перевірити чи мають таблиці службові дані" #: templates/database/structure/check_all_tables.twig:10 msgid "Copy table" From d9f819be71a793a01bd078122acf1dad8d86899f Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Tue, 11 Sep 2018 06:01:14 +0000 Subject: [PATCH 3/7] Translated using Weblate (English (United Kingdom)) Currently translated at 100.0% (3294 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/en_GB/ Signed-off-by: Robert Readman --- po/en_GB.po | 277 +++++++++++++++++++--------------------------------- 1 file changed, 99 insertions(+), 178 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 980d6a1289..16f5b6325b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-08-26 19:06+0200\n" -"PO-Revision-Date: 2018-02-12 15:28+0000\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2018-09-12 07:16+0000\n" +"Last-Translator: Robert Readman \n" "Language-Team: English (United Kingdom) \n" +"phpmyadmin/4-8/en_GB/>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.19-dev\n" +"X-Generator: Weblate 3.2-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1101 msgid "Bad type!" @@ -930,6 +930,8 @@ msgid "" "You are trying to reduce the number of rows, but have already entered data " "in those rows which will be lost. Do you wish to continue?" msgstr "" +"You are trying to reduce the number of rows, but have already entered data " +"in those rows which will be lost. Do you wish to continue?" #: js/messages.php:75 msgid "Do you really want to revoke the selected user(s) ?" @@ -2270,7 +2272,7 @@ msgstr "" #: js/messages.php:562 msgid "value/subQuery is empty" -msgstr "" +msgstr "value/subQuery is empty" #: js/messages.php:563 templates/database/designer/side_menu.twig:34 #: templates/database/designer/side_menu.twig:37 @@ -2674,12 +2676,12 @@ msgstr "Strong" #: js/messages.php:749 msgid "Timed out waiting for security key activation." -msgstr "" +msgstr "Timed out waiting for security key activation." #: js/messages.php:750 #, php-format msgid "Failed security key activation (%s)." -msgstr "" +msgstr "Failed security key activation (%s)." #: js/messages.php:779 msgctxt "Previous month" @@ -4753,16 +4755,12 @@ msgid "Show databases navigation as tree" msgstr "Show databases navigation as tree" #: libraries/classes/Config/Descriptions.php:772 -#, fuzzy -#| msgid "Navigation panel" msgid "Navigation panel width" -msgstr "Navigation panel" +msgstr "Navigation panel width" #: libraries/classes/Config/Descriptions.php:774 -#, fuzzy -#| msgid "Show logo in navigation panel." msgid "Set to 0 to collapse navigation panel." -msgstr "Show logo in navigation panel." +msgstr "Set to 0 to collapse navigation panel." #: libraries/classes/Config/Descriptions.php:776 msgid "Link with main panel by highlighting the current database or table." @@ -5255,18 +5253,14 @@ msgid "Hide databases matching regular expression (PCRE)." msgstr "Hide databases matching regular expression (PCRE)." #: libraries/classes/Config/Descriptions.php:1041 -#, fuzzy -#| msgid "" -#| "More information on [a@https://sourceforge.net/p/phpmyadmin/" -#| "bugs/2606/]PMA bug tracker[/a] and [a@https://bugs.mysql.com/19588]MySQL " -#| "Bugs[/a]" msgid "" "More information on [a@https://github.com/phpmyadmin/phpmyadmin/" "issues/8970]phpMyAdmin issue tracker[/a] and [a@https://bugs.mysql." "com/19588]MySQL Bugs[/a]" msgstr "" -"More information on [a@https://sourceforge.net/p/phpmyadmin/bugs/2606/]PMA " -"bug tracker[/a] and [a@https://bugs.mysql.com/19588]MySQL Bugs[/a]" +"More information on [a@https://github.com/phpmyadmin/phpmyadmin/issues/8970]" +"phpMyAdmin issue tracker[/a] and [a@https://bugs.mysql.com/19588]MySQL " +"Bugs[/a]" #: libraries/classes/Config/Descriptions.php:1045 msgid "Disable use of INFORMATION_SCHEMA" @@ -6094,14 +6088,8 @@ msgid "Show current browsing query" msgstr "Show current browsing query" #: libraries/classes/Config/Descriptions.php:1472 -#, fuzzy -#| msgid "" -#| "Execute queries on Enter and insert new line with Shift + Enter. To make " -#| "this permanent, view settings." msgid "Execute queries on Enter and insert new line with Shift + Enter" -msgstr "" -"Execute queries on Enter and insert new line with Shift + Enter. To make " -"this permanent, view settings." +msgstr "Execute queries on Enter and insert new line with Shift + Enter" #: libraries/classes/Config/Descriptions.php:1474 #: templates/console/display.twig:168 @@ -6109,16 +6097,12 @@ msgid "Switch to dark theme" msgstr "Switch to dark theme" #: libraries/classes/Config/Descriptions.php:1476 -#, fuzzy -#| msgid "Console" msgid "Console height" -msgstr "Console" +msgstr "Console height" #: libraries/classes/Config/Descriptions.php:1478 -#, fuzzy -#| msgid "Console" msgid "Console mode" -msgstr "Console" +msgstr "Console mode" #: libraries/classes/Config/Descriptions.php:1480 #: templates/console/display.twig:64 @@ -6130,10 +6114,8 @@ msgid "Order" msgstr "Order" #: libraries/classes/Config/Descriptions.php:1484 -#, fuzzy -#| msgid "Order by:" msgid "Order by" -msgstr "Order by:" +msgstr "Order by" #: libraries/classes/Config/FormDisplay.php:99 #: libraries/classes/Config/Validator.php:524 @@ -9082,7 +9064,7 @@ msgstr "Cannot log in to the MySQL server" #: libraries/classes/Plugins/AuthenticationPlugin.php:335 msgid "You have enabled two factor authentication, please confirm your login." -msgstr "" +msgstr "You have enabled two factor authentication, please confirm your login." #: libraries/classes/Plugins/Export/ExportCodegen.php:101 #: templates/display/import/import.twig:168 @@ -10043,6 +10025,8 @@ msgid "" "The gd PHP extension was not found. The QRcode can not be displayed without " "the gd PHP extension." msgstr "" +"The gd PHP extension was not found. The QRcode can not be displayed without " +"the gd PHP extension." #: libraries/classes/Plugins/TwoFactor/Application.php:146 msgid "Authentication Application (2FA)" @@ -10065,6 +10049,7 @@ msgstr "Hardware Sicherheitsschlüssel (FIDO U2F)" msgid "" "Provides authentication using hardware security tokens supporting FIDO U2F." msgstr "" +"Provides authentication using hardware security tokens supporting FIDO U2F." #: libraries/classes/Plugins/TwoFactor/Simple.php:52 msgid "Simple two-factor authentication" @@ -10072,27 +10057,24 @@ msgstr "Einfache Authentifizierung in zwei Schritten" #: libraries/classes/Plugins/TwoFactor/Simple.php:62 msgid "For testing purposes only!" -msgstr "" +msgstr "For testing purposes only!" #: libraries/classes/Plugins/TwoFactorPlugin.php:70 -#, fuzzy, php-format -#| msgid "Hardware authentication failed!" +#, php-format msgid "Two-factor authentication failed: %s" -msgstr "Hardware authentication failed!" +msgstr "Two-factor authentication failed: %s" #: libraries/classes/Plugins/TwoFactorPlugin.php:74 -#, fuzzy -#| msgid "Hardware authentication failed!" msgid "Two-factor authentication failed." -msgstr "Hardware authentication failed!" +msgstr "Two-factor authentication failed." #: libraries/classes/Plugins/TwoFactorPlugin.php:127 msgid "No Two-Factor" -msgstr "" +msgstr "No Two-Factor" #: libraries/classes/Plugins/TwoFactorPlugin.php:137 msgid "Login using password only." -msgstr "" +msgstr "Login using password only." #: libraries/classes/RecentFavoriteTable.php:145 msgid "Could not save recent table!" @@ -13696,6 +13678,8 @@ msgid "" "Failed to set session cookie. Maybe you are using HTTP instead of HTTPS to " "access phpMyAdmin." msgstr "" +"Failed to set session cookie. Maybe you are using HTTP instead of HTTPS to " +"access phpMyAdmin." #: libraries/common.inc.php:340 msgid "Invalid authentication method set in configuration:" @@ -13827,10 +13811,8 @@ msgid "Manage your settings" msgstr "Manage your settings" #: libraries/user_preferences.inc.php:38 -#, fuzzy -#| msgid "Config authentication" msgid "Two-factor authentication" -msgstr "Config authentication" +msgstr "Two-factor authentication" #: libraries/user_preferences.inc.php:63 prefs_manage.php:298 msgid "Configuration has been saved." @@ -13935,16 +13917,12 @@ msgid "You can reset all your settings and restore them to default values." msgstr "You can reset all your settings and restore them to default values." #: prefs_twofactor.php:29 -#, fuzzy -#| msgid "Internal relationship has been removed." msgid "Two-factor authentication has been removed." -msgstr "Internal relationship has been removed." +msgstr "Two-factor authentication has been removed." #: prefs_twofactor.php:39 -#, fuzzy -#| msgid "Invalid authentication method set in configuration:" msgid "Two-factor authentication has been configured." -msgstr "Invalid authentication method set in configuration:" +msgstr "Two-factor authentication has been configured." #: server_export.php:25 msgid "View dump (schema) of databases" @@ -13956,8 +13934,6 @@ msgid "No Privileges" msgstr "No Privileges" #: server_privileges.php:151 -#, fuzzy -#| msgid "You do not have the necessary privileges to create a trigger." msgid "You do not have privileges to manipulate with the users!" msgstr "You do not have privileges to manipulate with the users!" @@ -14315,27 +14291,29 @@ msgid "" "Please scan following QR code into the two-factor authentication app on your " "device and enter authentication code it generates." msgstr "" +"Please scan following QR code into the two-factor authentication app on your " +"device and enter authentication code it generates." #: templates/login/twofactor/application_configure.twig:11 msgid "" "Please enter following secret/key into the two-factor authentication app on " "your device and enter authentication code it generates." msgstr "" +"Please enter following secret/key into the two-factor authentication app on " +"your device and enter authentication code it generates." #: templates/login/twofactor/application_configure.twig:14 msgid "OTP url:" -msgstr "" +msgstr "OTP url:" #: templates/login/twofactor/application_configure.twig:18 msgid "Secret/key:" -msgstr "" +msgstr "Secret/key:" #: templates/login/twofactor/application_configure.twig:21 #: templates/login/twofactor/application.twig:2 -#, fuzzy -#| msgid "Authentication" msgid "Authentication code:" -msgstr "Authentication" +msgstr "Authentication code:" #: templates/table/search/rows_zoom.twig:12 msgid "Additional search criteria" @@ -14390,22 +14368,20 @@ msgid "PARTITION definition:" msgstr "PARTITION definition:" #: templates/prefs_twofactor_confirm.twig:2 -#, fuzzy -#| msgid "Config authentication" msgid "Confirm disabling two-factor authentication" -msgstr "Config authentication" +msgstr "Confirm disabling two-factor authentication" #: templates/prefs_twofactor_confirm.twig:5 msgid "" "By disabling two factor authentication you will be again able to login using " "password only." msgstr "" +"By disabling two factor authentication you will be again able to login using " +"password only." #: templates/prefs_twofactor_confirm.twig:9 templates/prefs_twofactor.twig:37 -#, fuzzy -#| msgid "Config authentication" msgid "Disable two-factor authentication" -msgstr "Config authentication" +msgstr "Disable two-factor authentication" #: templates/database/structure/structure_table_row.twig:222 msgid "in use" @@ -14555,8 +14531,6 @@ msgstr "Custom - display all possible options" #: templates/table/tracking/structure_snapshot_columns.twig:5 #: templates/table/tracking/report_table.twig:4 -#, fuzzy -#| msgid "#" msgctxt "Number" msgid "#" msgstr "#" @@ -14733,6 +14707,8 @@ msgid "" "Please connect your FIDO U2F device into your computer's USB port. Then " "confirm login on the device." msgstr "" +"Please connect your FIDO U2F device into your computer's USB port. Then " +"confirm login on the device." #: templates/display/export/options_quick_export.twig:2 #: templates/display/export/options_output.twig:2 @@ -14741,10 +14717,9 @@ msgstr "Output:" #: templates/display/export/options_quick_export.twig:8 #: templates/display/export/options_output_save_dir.twig:5 -#, fuzzy, php-format -#| msgid "Save on server in the directory %s" +#, php-format msgid "Save on server in the directory %s" -msgstr "Save on server in the directory %s" +msgstr "Save on server in the directory %s" #: templates/columns_definitions/column_virtuality.twig:29 #: templates/table/structure/display_partitions.twig:26 @@ -14829,6 +14804,8 @@ msgid "" "Open the two-factor authentication app on your device to view your " "authentication code and verify your identity." msgstr "" +"Open the two-factor authentication app on your device to view your " +"authentication code and verify your identity." #: templates/prefs_autoload.twig:7 msgid "" @@ -14969,10 +14946,8 @@ msgid "Hide/Show all" msgstr "Hide/Show all" #: templates/database/designer/table_list.twig:14 -#, fuzzy -#| msgid "Hide/Show Tables with no relationship" msgid "Hide/Show tables with no relationship" -msgstr "Hide/Show Tables with no relationship" +msgstr "Hide/Show tables with no relationship" #: templates/database/designer/table_list.twig:55 msgid "Number of tables:" @@ -15200,16 +15175,12 @@ msgid "Server variables and settings" msgstr "Server variables and settings" #: templates/server/sub_page_header.twig:2 -#, fuzzy -#| msgid "Storage Engines" msgid "Storage engines" -msgstr "Storage Engines" +msgstr "Storage engines" #: templates/server/sub_page_header.twig:2 -#, fuzzy -#| msgid "Character Sets and Collations" msgid "Character sets and collations" -msgstr "Character Sets and Collations" +msgstr "Character sets and collations" #: templates/server/sub_page_header.twig:2 msgid "Databases statistics" @@ -15228,12 +15199,12 @@ msgid "gzipped" msgstr "gzipped" #: templates/login/twofactor/invalid.twig:2 -#, fuzzy -#| msgid "%sCreate%s missing phpMyAdmin configuration storage tables." msgid "" "The configured two factor authentication is not available, please install " "missing dependencies." -msgstr "%sCreate%s missing phpMyAdmin configuration storage tables." +msgstr "" +"The configured two factor authentication is not available, please install " +"missing dependencies." #: templates/table/structure/display_table_stats.twig:14 msgid "Space usage" @@ -15244,12 +15215,6 @@ msgid "Effective" msgstr "Effective" #: templates/columns_definitions/table_fields_definitions.twig:17 -#, fuzzy -#| msgid "" -#| "If column type is \"enum\" or \"set\", please enter the values using this " -#| "format: 'a','b','c'…
If you ever need to put a backslash (\"\\\") or " -#| "a single quote (\"'\") amongst those values, precede it with a backslash " -#| "(for example '\\\\xyz' or 'a\\'b')." msgid "" "If column type is \"enum\" or \"set\", please enter the values using this " "format: 'a','b','c'…
If you ever need to put a backslash (\"\") or a " @@ -15257,7 +15222,7 @@ msgid "" "example '\\\\xyz' or 'a\\'b')." msgstr "" "If column type is \"enum\" or \"set\", please enter the values using this " -"format: 'a','b','c'…
If you ever need to put a backslash (\"\\\") or a " +"format: 'a','b','c'…
If you ever need to put a backslash (\"\") or a " "single quote (\"'\") amongst those values, precede it with a backslash (for " "example '\\\\xyz' or 'a\\'b')." @@ -15288,12 +15253,6 @@ msgstr "Browser display transformation options" #: templates/columns_definitions/table_fields_definitions.twig:83 #: templates/columns_definitions/table_fields_definitions.twig:94 -#, fuzzy -#| msgid "" -#| "Please enter the values for transformation options using this format: " -#| "'a', 100, b,'c'…
If you ever need to put a backslash (\"\\\") or a " -#| "single quote (\"'\") amongst those values, precede it with a backslash " -#| "(for example '\\\\xyz' or 'a\\'b')." msgid "" "Please enter the values for transformation options using this format: 'a', " "100, b,'c'…
If you ever need to put a backslash (\"\\\") or a single " @@ -15391,16 +15350,12 @@ msgid "File may be compressed (%s) or uncompressed." msgstr "File may be compressed (%s) or uncompressed." #: templates/display/import/import.twig:58 -#, fuzzy -#| msgid "" -#| "A compressed file's name must end in .[format].[compression]. " -#| "Example: .sql.zip" msgid "" "A compressed file's name must end in .[format].[compression]. Example: .sql.zip" msgstr "" -"A compressed file's name must end in .[format].[compression]. " -"Example: .sql.zip" +"A compressed file's name must end in .[format].[compression]" +". Example: .sql.zip" #: templates/display/import/import.twig:69 #: templates/display/import/import.twig:84 @@ -15423,19 +15378,14 @@ msgstr "" "Previous import timed out, after resubmitting will continue from position %d." #: templates/display/import/import.twig:137 -#, fuzzy -#| msgid "" -#| "Allow the interruption of an import in case the script detects it is " -#| "close to the PHP timeout limit. (This might be a good way to import " -#| "large files, however it can break transactions.)" msgid "" "Allow the interruption of an import in case the script detects it is close " "to the PHP timeout limit. (This might be a good way to import large " "files, however it can break transactions.)" msgstr "" "Allow the interruption of an import in case the script detects it is close " -"to the PHP timeout limit. (This might be a good way to import large " -"files, however it can break transactions.)" +"to the PHP timeout limit. (This might be a good way to import large " +"files, however it can break transactions.)" #: templates/display/import/import.twig:144 msgid "Skip this number of queries (for SQL) starting from the first one:" @@ -15573,10 +15523,8 @@ msgid "Index choice:" msgstr "Index choice:" #: templates/table/index_form.twig:42 -#, fuzzy -#| msgid "Active options" msgid "Advanced Options" -msgstr "Active options" +msgstr "Advanced Options" #: templates/table/index_form.twig:48 msgid "Key block size:" @@ -15604,16 +15552,12 @@ msgstr "Active options" #: templates/prefs_twofactor_configure.twig:2 templates/prefs_twofactor.twig:43 #: templates/prefs_twofactor.twig:54 -#, fuzzy -#| msgid "Config authentication" msgid "Configure two-factor authentication" -msgstr "Config authentication" +msgstr "Configure two-factor authentication" #: templates/prefs_twofactor_configure.twig:8 -#, fuzzy -#| msgid "Config authentication" msgid "Enable two-factor authentication" -msgstr "Config authentication" +msgstr "Enable two-factor authentication" #: templates/display/export/option_header.twig:5 msgid "Exporting databases from the current server" @@ -15630,10 +15574,9 @@ msgid "Exporting rows from \"%s\" table" msgstr "Exporting rows from \"%s\" table" #: templates/database/structure/show_create_row.twig:7 -#, fuzzy, php-format -#| msgid "Create User" +#, php-format msgid "Create %s" -msgstr "Create User" +msgstr "Create %s" #: templates/view_create.twig:65 msgid "VIEW name" @@ -15645,7 +15588,7 @@ msgstr "Column names" #: templates/login/twofactor.twig:5 msgid "Verify" -msgstr "" +msgstr "Verify" #: templates/columns_definitions/move_column.twig:7 msgid "first" @@ -15659,19 +15602,18 @@ msgstr[0] "%1$s match in %2$s" msgstr[1] "%1$s matches in %2$s" #: templates/database/search/results.twig:56 -#, fuzzy -#| msgid "Total: %s match" -#| msgid_plural "Total: %s matches" msgid "Total: %count% match" msgid_plural "Total: %count% matches" -msgstr[0] "Total: %s match" -msgstr[1] "Total: %s matches" +msgstr[0] "Total: %count% match" +msgstr[1] "Total: %count% matches" #: templates/login/twofactor/key_configure.twig:3 msgid "" "Please connect your FIDO U2F device into your computer's USB port. Then " "confirm registration on the device." msgstr "" +"Please connect your FIDO U2F device into your computer's USB port. Then " +"confirm registration on the device." #: templates/privileges/add_privileges_table.twig:3 msgid "Add privileges on the following table:" @@ -15682,6 +15624,8 @@ msgid "" "You are not using https to access phpMyAdmin, therefore FIDO U2F device will " "most likely refuse to authenticate you." msgstr "" +"You are not using https to access phpMyAdmin, therefore FIDO U2F device will " +"most likely refuse to authenticate you." #: templates/table/search/replace_preview.twig:13 msgid "Find and replace - preview" @@ -15847,69 +15791,49 @@ msgstr "Query window" #: templates/database/multi_table_query/form.twig:18 #: templates/database/multi_table_query/form.twig:106 -#, fuzzy -#| msgid "Select table:" msgid "select table" -msgstr "Select table:" +msgstr "select table" #: templates/database/multi_table_query/form.twig:25 #: templates/database/multi_table_query/form.twig:114 -#, fuzzy -#| msgid "Select column:" msgid "select column" -msgstr "Select column:" +msgstr "select column" #: templates/database/multi_table_query/form.twig:31 -#, fuzzy -#| msgid "Tables" msgid "Table alias" -msgstr "Tables" +msgstr "Table alias" #: templates/database/multi_table_query/form.twig:32 -#, fuzzy -#| msgid "Column names" msgid "Column alias" -msgstr "Column names" +msgstr "Column alias" #: templates/database/multi_table_query/form.twig:35 -#, fuzzy -#| msgid "Use this column to label each point" msgid "Use this column in criteria" -msgstr "Use this column to label each point" +msgstr "Use this column in criteria" #: templates/database/multi_table_query/form.twig:38 -#, fuzzy -#| msgid "Criteria:" msgid "criteria" -msgstr "Criteria:" +msgstr "criteria" #: templates/database/multi_table_query/form.twig:52 -#, fuzzy -#| msgid "Add %s" msgid "Add as" -msgstr "Add %s" +msgstr "Add as" #: templates/database/multi_table_query/form.twig:97 -#, fuzzy -#| msgid "Alter column(s)" msgid "Another column" -msgstr "Alter column(s)" +msgstr "Another column" #: templates/database/multi_table_query/form.twig:125 msgid "Enter criteria as free text" -msgstr "" +msgstr "Enter criteria as free text" #: templates/database/multi_table_query/form.twig:133 -#, fuzzy -#| msgid "Remove redundant columns" msgid "Remove this column" -msgstr "Remove redundant columns" +msgstr "Remove this column" #: templates/database/multi_table_query/form.twig:160 -#, fuzzy -#| msgid "Update Query" msgid "Update query" -msgstr "Update Query" +msgstr "Update query" #: templates/toggle_button.twig:3 msgid "Click to toggle" @@ -15969,10 +15893,8 @@ msgid "No preview available." msgstr "No preview available." #: templates/theme_preview.twig:13 -#, fuzzy -#| msgid "take it" msgid "Take it" -msgstr "take it" +msgstr "Take it" #: templates/display/import/javascript.twig:12 msgid "" @@ -16023,16 +15945,14 @@ msgid "Save output to a file" msgstr "Save output to a file" #: templates/display/export/options_output.twig:51 -#, fuzzy, php-format -#| msgid "Skip tables larger than" +#, php-format msgid "Skip tables larger than %s MiB" -msgstr "Skip tables larger than" +msgstr "Skip tables larger than %s MiB" #: templates/server/databases/table_row.twig:13 -#, fuzzy, php-format -#| msgid "Jump to database" +#, php-format msgid "Jump to database '%s'" -msgstr "Jump to database" +msgstr "Jump to database '%s'" #: templates/server/databases/table_row.twig:61 #, php-format @@ -16044,41 +15964,42 @@ msgid "Check privileges" msgstr "Check privileges" #: templates/prefs_twofactor.twig:3 -#, fuzzy -#| msgid "Authentication settings." msgid "Two-factor authentication status" -msgstr "Authentication settings." +msgstr "Two-factor authentication status" #: templates/prefs_twofactor.twig:9 msgid "" "Two-factor authentication is not available, please install optional " "dependencies to enable authentication backends." msgstr "" +"Two-factor authentication is not available, please install optional " +"dependencies to enable authentication backends." #: templates/prefs_twofactor.twig:10 msgid "Following composer packages are missing:" -msgstr "" +msgstr "Following composer packages are missing:" #: templates/prefs_twofactor.twig:18 msgid "Two-factor authentication is available and configured for this account." -msgstr "" +msgstr "Two-factor authentication is available and configured for this account." #: templates/prefs_twofactor.twig:20 msgid "" "Two-factor authentication is available, but not configured for this account." msgstr "" +"Two-factor authentication is available, but not configured for this account." #: templates/prefs_twofactor.twig:24 -#, fuzzy -#| msgid "%sCreate%s missing phpMyAdmin configuration storage tables." msgid "" "Two-factor authentication is not available, enable phpMyAdmin configuration " "storage to use it." -msgstr "%sCreate%s missing phpMyAdmin configuration storage tables." +msgstr "" +"Two-factor authentication is not available, enable phpMyAdmin configuration " +"storage to use it." #: templates/prefs_twofactor.twig:33 msgid "You have enabled two factor authentication." -msgstr "" +msgstr "You have enabled two factor authentication." #: templates/table/relation/common_form.twig:6 msgid "Foreign key constraints" From 50f1605472e455afabb5df3afc58fcd697e20f5d Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Tue, 11 Sep 2018 13:37:54 +0000 Subject: [PATCH 4/7] Translated using Weblate (Ukrainian) Currently translated at 100.0% (3294 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/uk/ Signed-off-by: Isaac Bennetch --- po/uk.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/uk.po b/po/uk.po index a3e6840a72..979a2fb314 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-08-26 19:06+0200\n" -"PO-Revision-Date: 2018-09-10 07:27+0000\n" -"Last-Translator: Володимир Бриняк \n" +"PO-Revision-Date: 2018-09-12 13:51+0000\n" +"Last-Translator: Isaac Bennetch \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -7264,7 +7264,7 @@ msgstr "Рядок видалено." #: libraries/classes/Display/Results.php:4679 #: libraries/classes/Server/Status/Processes.php:279 msgid "Kill" -msgstr "Аналювати" +msgstr "Анулювати" #: libraries/classes/Display/Results.php:4120 msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]." From 1fe515a47344782eb50a58e8805ca112aa176ff5 Mon Sep 17 00:00:00 2001 From: Meno25 Date: Wed, 12 Sep 2018 18:38:16 +0000 Subject: [PATCH 5/7] Translated using Weblate (Arabic) Currently translated at 48.3% (1593 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ar/ Signed-off-by: Meno25 --- po/ar.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/po/ar.po b/po/ar.po index 9021c2250e..c31ee5e0dc 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-08-26 19:06+0200\n" -"PO-Revision-Date: 2018-04-16 18:34+0000\n" -"Last-Translator: Yaron Shahrabani \n" +"PO-Revision-Date: 2018-09-12 18:39+0000\n" +"Last-Translator: Meno25 \n" "Language-Team: Arabic \n" "Language: ar\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Weblate 3.0-dev\n" +"X-Generator: Weblate 3.2-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1101 msgid "Bad type!" @@ -677,10 +677,8 @@ msgid "Server type:" msgstr "نوع الخادم:" #: index.php:342 -#, fuzzy -#| msgid "% aborted connections" msgid "Server connection:" -msgstr "فرض إتصال SSL" +msgstr "اتصال الخادم:" #: index.php:346 libraries/classes/Plugins/Export/ExportLatex.php:223 #: libraries/classes/Plugins/Export/ExportSql.php:705 From 6c26805c293f861c36a94f464858812dab066f56 Mon Sep 17 00:00:00 2001 From: Rishwanth Yeddula Date: Thu, 5 Jul 2018 12:46:51 -0500 Subject: [PATCH 6/7] Ensure that database names with '.' are handled properly when DisableIS is true MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #13267 Signed-off-by: Rishwanth Yeddula (cherry picked from commit 1aed791258e8df083eeffe3be664c9b0fee8432e) Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/CheckUserPrivileges.php | 28 +++++++++++++------ test/classes/CheckUserPrivilegesTest.php | 33 +++++++++++++++++++++++ 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php index 4019798c71..7b3770d380 100644 --- a/libraries/classes/CheckUserPrivileges.php +++ b/libraries/classes/CheckUserPrivileges.php @@ -42,9 +42,24 @@ class CheckUserPrivileges public function getItemsFromShowGrantsRow($row) { $db_name_offset = mb_strpos($row, ' ON ') + 4; + + $tblname_end_offset = mb_strpos($row, ' TO '); + $tblname_start_offset = false; + + if ($__tblname_start_offset = mb_strpos($row, '`.', $db_name_offset)) { + if ($__tblname_start_offset < $tblname_end_offset) { + $tblname_start_offset = $__tblname_start_offset + 1; + } + } + + if (!$tblname_start_offset) { + $tblname_start_offset = mb_strpos($row, '.', $db_name_offset); + } + $show_grants_dbname = mb_substr( - $row, $db_name_offset, - mb_strpos($row, '.', $db_name_offset) - $db_name_offset + $row, + $db_name_offset, + $tblname_start_offset - $db_name_offset ); $show_grants_dbname = Util::unQuote($show_grants_dbname, '`'); @@ -55,13 +70,10 @@ class CheckUserPrivileges (mb_strpos($row, ' ON ') - 6) ); - // extrac table from GRANT sytax - $tblname_start_offset = mb_strpos($row, '.') + 1; - $tblname_end_offset = mb_strpos($row, ' TO '); - $show_grants_tblname = mb_substr( - $row, $tblname_start_offset, - $tblname_end_offset - $tblname_start_offset + $row, + $tblname_start_offset + 1, + $tblname_end_offset - $tblname_start_offset - 1 ); $show_grants_tblname = Util::unQuote($show_grants_tblname, '`'); diff --git a/test/classes/CheckUserPrivilegesTest.php b/test/classes/CheckUserPrivilegesTest.php index 981b090fee..e85a28ba29 100644 --- a/test/classes/CheckUserPrivilegesTest.php +++ b/test/classes/CheckUserPrivilegesTest.php @@ -127,6 +127,39 @@ class CheckUserPrivilegesTest extends TestCase "columns_priv", $show_grants_tblname ); + + // TEST CASE 4 + $show_grants_full_row = "GRANT ALL PRIVILEGES ON `cptest\_.`.* TO " + . "'cptest'@'localhost'"; + + list( + $show_grants_str, + $show_grants_dbname, + $show_grants_tblname + ) = $this->checkUserPrivileges->getItemsFromShowGrantsRow( + $show_grants_full_row + ); + + $this->assertEquals( + "cptest\_.", + $show_grants_dbname + ); + + $show_grants_full_row = "GRANT ALL PRIVILEGES ON `cptest\_.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z`.* TO " + . "'cptest'@'localhost'"; + + list( + $show_grants_str, + $show_grants_dbname, + $show_grants_tblname + ) = $this->checkUserPrivileges->getItemsFromShowGrantsRow( + $show_grants_full_row + ); + + $this->assertEquals( + "cptest\_.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z", + $show_grants_dbname + ); } /** From 95d30c2b520a69d25d6ec68c1638dcca99283bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 12 Sep 2018 15:47:16 -0300 Subject: [PATCH 7/7] Add ChangeLog entry for #13267 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index dc051d3cf8..b96e42467a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.8.4 (not yet released) - issue #14452 Remove hash param in edit query URL - issue #14295 Issue in Changing theme +- issue #13267 Ensure that database names with '.' are handled properly when DisableIS is true 4.8.3 (2018-08-22) - issue #14314 Error when naming a database '0'