From 1dd79010cb56106d4fdeaf6b1e3a1fa6e86041d4 Mon Sep 17 00:00:00 2001
From: Meno25 <meno25mail@gmail.com>
Date: Mon, 17 Apr 2023 17:41:00 +0000
Subject: [PATCH 1/2] Translated using Weblate (Arabic)

Currently translated at 56.6% (1942 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ar/
Signed-off-by: Meno25 <meno25mail@gmail.com>
---
 po/ar.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/ar.po b/po/ar.po
index ca5ac862e4..552cec3595 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 5.2.2-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2023-02-08 15:09+0000\n"
-"PO-Revision-Date: 2023-04-17 17:32+0000\n"
-"Last-Translator: Maurício Meneghini Fauth <mauricio@fauth.dev>\n"
+"PO-Revision-Date: 2023-04-18 10:06+0000\n"
+"Last-Translator: Meno25 <meno25mail@gmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/phpmyadmin/5-2/ar/"
 ">\n"
 "Language: ar\n"
@@ -8029,11 +8029,11 @@ msgstr "لايوجد صفوف مختارة."
 msgid "%1$d column has been dropped successfully."
 msgid_plural "%1$d columns have been dropped successfully."
 msgstr[0] "تم إسقاط %1$d من الأعمدة بنجاح."
-msgstr[1] "تم إسقاط عمود واحد بنجاح"
-msgstr[2] "تم اسقاط عمودان بنجاح"
-msgstr[3] "تم إسقاط %1$d أعمدة بنجاح"
-msgstr[4] "تم إسقاط %1$d عمود بنجاح"
-msgstr[5] "تم إسقاط %1$d عمود بنجاح"
+msgstr[1] "تم إسقاط عمود واحد بنجاح."
+msgstr[2] "تم اسقاط عمودان بنجاح."
+msgstr[3] "تم إسقاط %1$d أعمدة بنجاح."
+msgstr[4] "تم إسقاط %1$d عمود بنجاح."
+msgstr[5] "‍تم إسقاط %1$d عمود بنجاح."
 
 #: libraries/classes/Controllers/Table/GetFieldController.php:63
 msgid "Invalid table name"
@@ -12422,7 +12422,7 @@ msgid "Tracking for %1$s was deactivated at version %2$s."
 msgstr "تم إلغاء تنشيط تتبع %1$s في الإصدار %2$s."
 
 #: libraries/classes/Tracking.php:979
-#, fuzzy, php-format
+#, php-format
 msgid "Version %1$s of %2$s was deleted."
 msgstr "تم حذف الإصدار %1$s من %2$s."
 

From 5a2baf607fa9bcdd4bce07bb5bf1f5d7b6091450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Wed, 19 Apr 2023 18:32:51 -0300
Subject: [PATCH 2/2] Fix ExportSqlTest failing test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to https://github.com/phpmyadmin/sql-parser/pull/438

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 test/classes/Plugins/Export/ExportSqlTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
index deef72620c..80c46be686 100644
--- a/test/classes/Plugins/Export/ExportSqlTest.php
+++ b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -1611,7 +1611,8 @@ class ExportSqlTest extends AbstractTestCase
         );
 
         $table = 'bar';
-        $sql_query = 'CREATE TRIGGER `BEFORE_bar_INSERT` '
+        $sql_query = 'DELIMITER $$' . "\n"
+            . 'CREATE TRIGGER `BEFORE_bar_INSERT` '
             . 'BEFORE INSERT ON `bar` '
             . 'FOR EACH ROW BEGIN '
             . 'SET @cnt=(SELECT count(*) FROM bar WHERE '