Merge remote-tracking branch 'origin/5.4'

# Conflicts: # resources/i18n/cs_CZ/uranium.po # resources/i18n/de_DE/uranium.po # resources/i18n/es_ES/uranium.po # resources/i18n/fi_FI/uranium.po # resources/i18n/fr_FR/uranium.po # resources/i18n/hu_HU/uranium.po # resources/i18n/it_IT/uranium.po # resources/i18n/ja_JP/uranium.po # resources/i18n/ko_KR/uranium.po # resources/i18n/nl_NL/uranium.po # resources/i18n/pl_PL/uranium.po # resources/i18n/pt_BR/uranium.po # resources/i18n/pt_PT/uranium.po # resources/i18n/ru_RU/uranium.po # resources/i18n/tr_TR/uranium.po # resources/i18n/uranium.pot # resources/i18n/zh_CN/uranium.po # resources/i18n/zh_TW/uranium.po
Ultimaker · Jul 4, 2023 · 49ba701 · 49ba701
2 parents 52f7670 + 8de64bf
commit 49ba701
Show file tree

Hide file tree

Showing 19 changed files with 58 additions and 50 deletions.
diff --git a/UM/Settings/ContainerRegistry.py b/UM/Settings/ContainerRegistry.py
@@ -400,9 +400,17 @@ def _recreateCorruptDataBase(self, cursor: Optional[db.Cursor]) -> None:
         except:
             # Could be that the cursor is already closed
             pass
-        cursor.close()
 
-        self._db_connection = None
+        try:
+            cursor.close()
+        except db.ProgrammingError:
+            # Database was already closed
+            pass
+
+        if self._db_connection is not None:
+            self._db_connection.close()
+            self._db_connection = None
+
         db_path = os.path.join(Resources.getCacheStoragePath(), "containers.db")
         try:
             os.remove(db_path)

diff --git a/resources/i18n/cs_CZ/uranium.po b/resources/i18n/cs_CZ/uranium.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: 2022-04-26 00:14+0200\n"
 "Last-Translator: Miroslav Šustek <sustmidown@centrum.cz>\n"
 "Language-Team: DenyCZ <www.github.com/DenyCZ>\n"

diff --git a/resources/i18n/de_DE/uranium.po b/resources/i18n/de_DE/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/es_ES/uranium.po b/resources/i18n/es_ES/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/fi_FI/uranium.po b/resources/i18n/fi_FI/uranium.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: 2017-09-27 12:27+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Finnish <info@bothof.nl>\n"

diff --git a/resources/i18n/fr_FR/uranium.po b/resources/i18n/fr_FR/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/hu_HU/uranium.po b/resources/i18n/hu_HU/uranium.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: 2019-10-10 22:30+0200\n"
 "Last-Translator: Nagy Attila\n"
 "Language-Team: AT-VLOG <LL@li.org>\n"

diff --git a/resources/i18n/it_IT/uranium.po b/resources/i18n/it_IT/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/ja_JP/uranium.po b/resources/i18n/ja_JP/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/ko_KR/uranium.po b/resources/i18n/ko_KR/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/nl_NL/uranium.po b/resources/i18n/nl_NL/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/pl_PL/uranium.po b/resources/i18n/pl_PL/uranium.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: 2019-11-15 15:35+0100\n"
 "Last-Translator: Mariusz 'Virgin71' Matłosz <matliks@gmail.com>\n"
 "Language-Team: reprapy.pl\n"

diff --git a/resources/i18n/pt_BR/uranium.po b/resources/i18n/pt_BR/uranium.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: 2022-04-25 07:03+0200\n"
 "Last-Translator: Cláudio Sampaio <patola@gmail.com>\n"
 "Language-Team: Cláudio Sampaio\n"

diff --git a/resources/i18n/pt_PT/uranium.po b/resources/i18n/pt_PT/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/ru_RU/uranium.po b/resources/i18n/ru_RU/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/tr_TR/uranium.po b/resources/i18n/tr_TR/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/uranium.pot b/resources/i18n/uranium.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -598,122 +598,122 @@ msgid "Local Container Provider"
 msgstr ""
 
 msgctxt "description"
-msgid "Provides a simple solid mesh view."
+msgid "Provides the Rotate tool."
 msgstr ""
 
 msgctxt "name"
-msgid "Simple View"
+msgid "Rotate Tool"
 msgstr ""
 
 msgctxt "description"
-msgid "Enables saving to local files."
+msgid "Provides the Move tool."
 msgstr ""
 
 msgctxt "name"
-msgid "Local File Output Device"
+msgid "Move Tool"
 msgstr ""
 
 msgctxt "description"
-msgid "Checks for updates of the software."
+msgid "Provides the tool to manipulate the camera."
 msgstr ""
 
 msgctxt "name"
-msgid "Update Checker"
+msgid "Camera Tool"
 msgstr ""
 
 msgctxt "description"
-msgid "Outputs log information to a file in your settings folder."
+msgid "Provides the Mirror tool."
 msgstr ""
 
 msgctxt "name"
-msgid "File Logger"
+msgid "Mirror Tool"
 msgstr ""
 
 msgctxt "description"
-msgid "Provides support for reading STL files."
+msgid "Provides the Scale tool."
 msgstr ""
 
 msgctxt "name"
-msgid "STL Reader"
+msgid "Scale Tool"
 msgstr ""
 
 msgctxt "description"
-msgid "Makes it possible to write Wavefront OBJ files."
+msgid "Provides the Selection tool."
 msgstr ""
 
 msgctxt "name"
-msgid "Wavefront OBJ Writer"
+msgid "Selection Tool"
 msgstr ""
 
 msgctxt "description"
-msgid "Provides support for writing STL files."
+msgid "Enables saving to local files."
 msgstr ""
 
 msgctxt "name"
-msgid "STL Writer"
+msgid "Local File Output Device"
 msgstr ""
 
 msgctxt "description"
-msgid "Makes it possible to read Wavefront OBJ files."
+msgid "Outputs log information to a file in your settings folder."
 msgstr ""
 
 msgctxt "name"
-msgid "Wavefront OBJ Reader"
+msgid "File Logger"
 msgstr ""
 
 msgctxt "description"
-msgid "Provides the Scale tool."
+msgid "Outputs log information to the console."
 msgstr ""
 
 msgctxt "name"
-msgid "Scale Tool"
+msgid "Console Logger"
 msgstr ""
 
 msgctxt "description"
-msgid "Provides the tool to manipulate the camera."
+msgid "Checks for updates of the software."
 msgstr ""
 
 msgctxt "name"
-msgid "Camera Tool"
+msgid "Update Checker"
 msgstr ""
 
 msgctxt "description"
-msgid "Provides the Move tool."
+msgid "Makes it possible to read Wavefront OBJ files."
 msgstr ""
 
 msgctxt "name"
-msgid "Move Tool"
+msgid "Wavefront OBJ Reader"
 msgstr ""
 
 msgctxt "description"
-msgid "Provides the Selection tool."
+msgid "Makes it possible to write Wavefront OBJ files."
 msgstr ""
 
 msgctxt "name"
-msgid "Selection Tool"
+msgid "Wavefront OBJ Writer"
 msgstr ""
 
 msgctxt "description"
-msgid "Provides the Rotate tool."
+msgid "Provides support for reading STL files."
 msgstr ""
 
 msgctxt "name"
-msgid "Rotate Tool"
+msgid "STL Reader"
 msgstr ""
 
 msgctxt "description"
-msgid "Provides the Mirror tool."
+msgid "Provides support for writing STL files."
 msgstr ""
 
 msgctxt "name"
-msgid "Mirror Tool"
+msgid "STL Writer"
 msgstr ""
 
 msgctxt "description"
-msgid "Outputs log information to the console."
+msgid "Provides a simple solid mesh view."
 msgstr ""
 
 msgctxt "name"
-msgid "Console Logger"
+msgid "Simple View"
 msgstr ""
 
diff --git a/resources/i18n/zh_CN/uranium.po b/resources/i18n/zh_CN/uranium.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/resources/i18n/zh_TW/uranium.po b/resources/i18n/zh_TW/uranium.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Uranium 5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-15 20:47+0000\n"
+"POT-Creation-Date: 2023-07-03 10:52+0000\n"
 "PO-Revision-Date: 2022-01-02 20:28+0800\n"
 "Last-Translator: Valen Chang  <carf17771@gmail.com>\n"
 "Language-Team: Valen Chang <carf17771@gmail.com>\n"