Update PO

po/cartridges.pot

@@ -8,8 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cartridges\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-25 21:54+0200\n"
-"POT-Creation-Date: 2024-10-31 14:25+0100\n"
+"POT-Creation-Date: 2024-10-31 17:38+0100\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"
@@ -125,7 +124,7 @@ msgid "Keyboard Shortcuts"
 msgstr ""
 
 #: data/gtk/help-overlay.blp:29 cartridges/game.py:103
-#: cartridges/preferences.py:137 cartridges/importer/importer.py:394
+#: cartridges/preferences.py:137 cartridges/importer/importer.py:387
 msgid "Undo"
 msgstr ""
 
@@ -199,32 +198,6 @@ msgstr ""
 msgid "Remove All Games"
 msgstr ""
 
-<<<<<<< HEAD
-#: data/gtk/preferences.blp:47
-msgid "Reset App"
-msgstr ""
-
-#: data/gtk/preferences.blp:65
-msgid "Remove Uninstalled Games"
-msgstr ""
-
-#: data/gtk/preferences.blp:70
-msgid "Sources"
-msgstr ""
-
-#: data/gtk/preferences.blp:74 cartridges/importer/steam_source.py:114
-msgid "Steam"
-msgstr ""
-
-#: data/gtk/preferences.blp:83 data/gtk/preferences.blp:110
-#: data/gtk/preferences.blp:145 data/gtk/preferences.blp:188
-#: data/gtk/preferences.blp:215 data/gtk/preferences.blp:242
-#: data/gtk/preferences.blp:269
-msgid "Install Location"
-msgstr ""
-
-#: data/gtk/preferences.blp:101 data/gtk/window.blp:565
-=======
 #: data/gtk/preferences.blp:65
 msgid "Import Games Automatically"
 msgstr ""
@@ -253,52 +226,6 @@ msgstr ""
 msgid "Lutris"
 msgstr ""
 
-#: data/gtk/preferences.blp:127
-msgid "Import Steam Games"
-msgstr ""
-
-#: data/gtk/preferences.blp:131
-msgid "Import Flatpak Games"
-msgstr ""
-
-#: data/gtk/preferences.blp:136 cartridges/importer/heroic_source.py:355
-msgid "Heroic"
-msgstr ""
-
-#: data/gtk/preferences.blp:162
-msgid "Import Epic Games"
-msgstr ""
-
-#: data/gtk/preferences.blp:166
-msgid "Import GOG Games"
-msgstr ""
-
-#: data/gtk/preferences.blp:170
-msgid "Import Amazon Games"
-msgstr ""
-
-#: data/gtk/preferences.blp:174
-msgid "Import Sideloaded Games"
-msgstr ""
-
-#: data/gtk/preferences.blp:179 cartridges/importer/bottles_source.py:86
-msgid "Bottles"
-msgstr ""
-
-#: data/gtk/preferences.blp:206 cartridges/importer/itch_source.py:81
-msgid "itch"
-msgstr ""
-
-#: data/gtk/preferences.blp:233 cartridges/importer/legendary_source.py:97
-msgid "Legendary"
-msgstr ""
-
-#: data/gtk/preferences.blp:260 cartridges/importer/retroarch_source.py:142
-msgid "RetroArch"
-msgstr ""
-
-#: data/gtk/preferences.blp:287 cartridges/importer/flatpak_source.py:143
-=======
 #: data/gtk/preferences.blp:131
 msgid "Import Steam Games"
 msgstr ""
@@ -353,57 +280,6 @@ msgid "System Location"
 msgstr ""
 
 #. The location of the user-specific data directory
-<<<<<<< HEAD
-#: data/gtk/preferences.blp:315
-msgid "User Location"
-msgstr ""
-
-#: data/gtk/preferences.blp:332
-msgid "Import Game Launchers"
-msgstr ""
-
-#: data/gtk/preferences.blp:337 cartridges/importer/desktop_source.py:215
-msgid "Desktop Entries"
-msgstr ""
-
-#: data/gtk/preferences.blp:349 data/gtk/window.blp:563
-msgid "SteamGridDB"
-msgstr ""
-
-#: data/gtk/preferences.blp:353
-msgid "Authentication"
-msgstr ""
-
-#: data/gtk/preferences.blp:356
-msgid "API Key"
-msgstr ""
-
-#: data/gtk/preferences.blp:364
-msgid "Use SteamGridDB"
-msgstr ""
-
-#: data/gtk/preferences.blp:365
-msgid "Download images when adding or importing games"
-msgstr ""
-
-#: data/gtk/preferences.blp:369
-msgid "Prefer Over Official Images"
-msgstr ""
-
-#: data/gtk/preferences.blp:373
-msgid "Prefer Animated Images"
-msgstr ""
-
-#: data/gtk/preferences.blp:379
-msgid "Update Covers"
-msgstr ""
-
-#: data/gtk/preferences.blp:380
-msgid "Fetch covers for games already in your library"
-msgstr ""
-
-#: data/gtk/preferences.blp:385
-=======
 #: data/gtk/preferences.blp:319
 msgid "User Location"
 msgstr ""
@@ -553,7 +429,6 @@ msgstr ""
 msgid "{} launched"
 msgstr ""
 
-<<<<<<< HEAD
 #. Translators: Replace this with Your Name, Your Name <your.email@example.com>, or Your Name https://your-site.com for it to show up in the About dialog.
 #: cartridges/main.py:291
 msgid "translator-credits"
@@ -652,13 +527,6 @@ msgstr ""
 msgid "{} removed"
 msgstr ""
 
-<<<<<<< HEAD
-#: cartridges/preferences.py:135
-msgid "All games removed"
-msgstr ""
-
-#: cartridges/preferences.py:187
-=======
 #: cartridges/preferences.py:136
 msgid "All games removed"
 msgstr ""
@@ -668,33 +536,6 @@ msgid ""
 "An API key is required to use SteamGridDB. You can generate one {}here{}."
 msgstr ""
 
-<<<<<<< HEAD
-#: cartridges/preferences.py:202
-msgid "Downloading covers…"
-msgstr ""
-
-#: cartridges/preferences.py:221
-msgid "Covers updated"
-msgstr ""
-
-#: cartridges/preferences.py:368
-msgid "Installation Not Found"
-msgstr ""
-
-#: cartridges/preferences.py:369
-msgid "Select a valid directory"
-msgstr ""
-
-#: cartridges/preferences.py:405 cartridges/importer/importer.py:319
-msgid "Warning"
-msgstr ""
-
-#: cartridges/preferences.py:439
-msgid "Invalid Directory"
-msgstr ""
-
-#: cartridges/preferences.py:445
-=======
 #: cartridges/preferences.py:203
 msgid "Downloading covers…"
 msgstr ""
@@ -723,7 +564,7 @@ msgstr ""
 msgid "Set Location"
 msgstr ""
 
-#: cartridges/utils/create_dialog.py:33 cartridges/importer/importer.py:320
+#: cartridges/utils/create_dialog.py:33 cartridges/importer/importer.py:319
 msgid "Dismiss"
 msgstr ""
 
@@ -731,23 +572,23 @@ msgstr ""
 msgid "Importing Games…"
 msgstr ""
 
-#: cartridges/importer/importer.py:339
+#: cartridges/importer/importer.py:338
 msgid "The following errors occured during import:"
 msgstr ""
 
-#: cartridges/importer/importer.py:368
+#: cartridges/importer/importer.py:367
 msgid "No new games found"
 msgstr ""
 
 #. The variable is the number of games imported
-#: cartridges/importer/importer.py:381
+#: cartridges/importer/importer.py:380
 msgid "1 game imported"
 msgid_plural "{} games imported"
 msgstr[0] ""
 msgstr[1] ""
 
 #. The variable is the number of games removed
-#: cartridges/importer/importer.py:385
+#: cartridges/importer/importer.py:384
 msgid "1 removed"
 msgid_plural "{} removed"
 msgstr[0] ""