From bd08cdde0add8dc0669d29d03c252c9091cfc045 Mon Sep 17 00:00:00 2001 From: Anusuk Sangubon Date: Thu, 16 Aug 2018 10:31:33 +0000 Subject: [PATCH 1/4] Translated using Weblate (Thai) Currently translated at 29.6% (976 of 3288 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/th/ Signed-off-by: Anusuk Sangubon --- po/th.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/th.po b/po/th.po index bb378813b9..304a494ac5 100644 --- a/po/th.po +++ b/po/th.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-05-19 17:57+0000\n" -"Last-Translator: Anawin Wongsadit \n" +"PO-Revision-Date: 2018-08-17 10:42+0000\n" +"Last-Translator: Anusuk Sangubon \n" "Language-Team: Thai " "\n" "Language: th\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.0-dev\n" +"X-Generator: Weblate 3.2-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 msgid "Bad type!" @@ -145,7 +145,6 @@ msgstr "ค่าว่าง" #: templates/table/structure/table_structure_header.twig:10 #: templates/table/tracking/structure_snapshot_columns.twig:10 #: templates/columns_definitions/table_fields_definitions.twig:20 -#, fuzzy msgid "Default" msgstr "ค่าเริ่มต้น" @@ -207,7 +206,6 @@ msgstr "คีย์หลัก" #: templates/table/tracking/structure_snapshot_indexes.twig:24 #: templates/table/tracking/structure_snapshot_columns.twig:33 #: templates/table/structure/table_structure_row.twig:25 -#, fuzzy msgid "No" msgstr "ไม่ใช่" @@ -301,8 +299,6 @@ msgstr "ข้อมูล" #: db_export.php:73 libraries/classes/ReplicationGui.php:391 #: templates/database/search/selection_form.twig:32 #: templates/display/export/select_options.twig:4 -#, fuzzy -#| msgid "Select All" msgid "Select all" msgstr "เลือกทั้งหมด" @@ -348,10 +344,8 @@ msgid "Access denied!" msgstr "ไม่อนุญาตให้ใช้งาน" #: db_tracking.php:55 db_tracking.php:80 -#, fuzzy -#| msgid "Chart generated successfully." msgid "Tracking data deleted successfully." -msgstr "สิทธิได้ถูกเรียกใช้ใหม่เรียบร้อยแล้ว" +msgstr "ลบข้อมูลการติดตามแล้ว" #: db_tracking.php:64 #, php-format From 95732c711ee5ba738d699ac9c4d062d4bc7de260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Thu, 16 Aug 2018 19:13:27 +0000 Subject: [PATCH 2/4] Translated using Weblate (Estonian) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (3288 of 3288 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/et/ Signed-off-by: Kristjan Räts --- po/et.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/et.po b/po/et.po index 97c8790a0d..85aa9c7861 100644 --- a/po/et.po +++ b/po/et.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-01-26 16:40+0000\n" +"PO-Revision-Date: 2018-08-17 19:36+0000\n" "Last-Translator: Kristjan Räts \n" -"Language-Team: Estonian \n" +"Language-Team: Estonian \n" "Language: et\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:1100 msgid "Bad type!" @@ -14831,7 +14831,7 @@ msgstr "Muuda partitsioneerimist" #: templates/table/structure/display_structure.twig:191 #: templates/table/structure/display_partitions.twig:4 msgid "Partitions" -msgstr "Partitsioonid" +msgstr "Jaotised" #: templates/encoding/kanji_encoding_form.twig:6 msgctxt "None encoding conversion" From 3fb214ac9e17edbc00d50d16740b489ac019183f Mon Sep 17 00:00:00 2001 From: Victor Alagwu Date: Wed, 22 Aug 2018 05:12:32 +0100 Subject: [PATCH 3/4] Fix escaped HTML in 'Add a new server' setup (#14585) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #14581 Signed-off-by: Victor Alagwu (cherry picked from commit ec4331b7ce4f805e9cbd76fae074953284884c9f) Signed-off-by: Maurício Meneghini Fauth --- templates/config/form_display/fieldset_top.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/config/form_display/fieldset_top.twig b/templates/config/form_display/fieldset_top.twig index 614e2a217d..e359e92db6 100644 --- a/templates/config/form_display/fieldset_top.twig +++ b/templates/config/form_display/fieldset_top.twig @@ -4,7 +4,7 @@ {%- endfor %}> {{ title }} {% if description is not empty %} -

{{ description }}

+

{{ description|raw }}

{% endif %} {# This must match with displayErrors() in scripts.js #} {% if errors is iterable and errors|length > 0 %} From 8f3ddd78f838f6821b0e9e9ae9ce880b2cde0a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 22 Aug 2018 01:17:26 -0300 Subject: [PATCH 4/4] Add ChangeLog entry for #14581 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 44c7879a08..50848305cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog - issue #14554 Icon missing when creating a new trigger, routine, and event - issue #14422 Table comment not showing since 4.8.1 - issue #14426 Drop table doesn't work when you copy tables to another database +- issue #14581 Escaped HTML in 'Add a new server' setup 4.8.2 (2018-06-21) - issue #14370 WHERE 0 causes Fatal error