From 3e1f1baed0408b7cde6d0346bf6a8fb3ea0e67ea Mon Sep 17 00:00:00 2001
From: Domen <mitenem@outlook.com>
Date: Tue, 7 Jun 2022 15:05:47 +0000
Subject: [PATCH 1/3] Translated using Weblate (Slovenian)

Currently translated at 99.9% (3416 of 3418 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/sl/
Signed-off-by: Domen <mitenem@outlook.com>
---
 po/sl.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/sl.po b/po/sl.po
index 33fa10b520..cc913fc3da 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 5.2.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2022-04-21 15:54-0300\n"
-"PO-Revision-Date: 2022-06-02 08:18+0000\n"
+"PO-Revision-Date: 2022-06-08 15:16+0000\n"
 "Last-Translator: Domen <mitenem@outlook.com>\n"
 "Language-Team: Slovenian <https://hosted.weblate.org/projects/phpmyadmin/5-2/"
 "sl/>\n"
@@ -13644,7 +13644,7 @@ msgstr "Opredelitev PARTITION:"
 #: templates/columns_definitions/column_definitions_form.twig:154
 msgctxt "Online transaction part of the SQL DDL for InnoDB"
 msgid "Online transaction"
-msgstr "Spletna transakcija"
+msgstr "Sprotna transakcija"
 
 #: templates/columns_definitions/column_definitions_form.twig:166
 msgid ""

From 54363500750eb5d1bf37d1693e04ea5cb563a540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Thu, 9 Jun 2022 14:02:01 -0300
Subject: [PATCH 2/3] Update Psalm baseline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 psalm-baseline.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index be430c4b4b..24eb45a806 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -12502,7 +12502,7 @@
       <code>$arrInstance[$name]</code>
       <code>$arrInstance[$name]</code>
     </MixedArrayOffset>
-    <MixedAssignment occurrences="20">
+    <MixedAssignment occurrences="21">
       <code>$arrInstance[$name]</code>
       <code>$arrProp</code>
       <code>$arrWEBMCol</code>
@@ -12510,6 +12510,7 @@
       <code>$mem['MemFree']</code>
       <code>$mem['MemTotal']</code>
       <code>$mem['MemUsed']</code>
+      <code>$mem['SwapFree']</code>
       <code>$mem['SwapPeak']</code>
       <code>$mem['SwapTotal']</code>
       <code>$mem['SwapUsed']</code>
@@ -12528,8 +12529,9 @@
       <code>ConnectServer</code>
       <code>Instances_</code>
     </MixedMethodCall>
-    <MixedOperand occurrences="6">
+    <MixedOperand occurrences="7">
       <code>$mem['MemTotal']</code>
+      <code>$mem['SwapTotal']</code>
       <code>$sum</code>
       <code>$swapdevice['AllocatedBaseSize']</code>
       <code>$swapdevice['CurrentUsage']</code>

From d7304c19966d45c810aa4a079c96182796ee8e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Thu, 9 Jun 2022 16:34:02 -0300
Subject: [PATCH 3/3] Fix empty Selenium screenshots for failing tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- https://github.com/php-webdriver/php-webdriver/issues/969

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 test/selenium/TestBase.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index 967dbaf55c..e1c6d6aefd 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -1109,10 +1109,11 @@ JS;
             $this->dbQuery('DROP DATABASE IF EXISTS `phpmyadmin`;');
         }
 
-        if (! $this->hasFailed()) {
-            $this->markTestAs('passed', '');
+        if ($this->hasFailed()) {
+            return;
         }
 
+        $this->markTestAs('passed', '');
         $this->sqlWindowHandle = null;
         $this->webDriver->quit();
     }