diff --git a/data/gtk/help-overlay.blp b/data/gtk/help-overlay.blp
index 9982000..ccf3480 100644
--- a/data/gtk/help-overlay.blp
+++ b/data/gtk/help-overlay.blp
@@ -8,54 +8,54 @@ ShortcutsWindow help_overlay {
     max-height: 10;
 
     ShortcutsGroup {
-      title: C_("shortcuts window", "General");
+      title: _("General");
 
       ShortcutsShortcut {
-        title: C_("shortcuts window", "Quit");
+        title: _("Quit");
         action-name: "app.quit";
       }
 
       ShortcutsShortcut {
-        title: C_("shortcuts window", "Search");
+        title: _("Search");
         action-name: "win.toggle_search";
       }
 
       ShortcutsShortcut {
-        title: C_("shortcuts window", "Show preferences");
+        title: _("Show preferences");
         action-name: "app.preferences";
       }
 
       ShortcutsShortcut {
-        title: C_("shortcuts window", "Shortcuts");
+        title: _("Shortcuts");
         action-name: "win.show-help-overlay";
       }
 
       ShortcutsShortcut {
-        title: C_("shortcuts window", "Undo");
+        title: _("Undo");
         action-name: "win.undo_remove";
       }
 
       ShortcutsShortcut {
-        title: C_("shortcuts window", "Open menu");
+        title: _("Open menu");
         action-name: "win.open_menu";
       }
     }
 
     ShortcutsGroup {
-      title: C_("shortcuts window", "Games");
+      title: _("Games");
 
       ShortcutsShortcut {
-        title: C_("shortcuts window", "Add new game");
+        title: _("Add new game");
         action-name: "app.add_game";
       }
 
       ShortcutsShortcut {
-        title: C_("shortcuts window", "Import games");
+        title: _("Import games");
         action-name: "app.import";
       }
 
       ShortcutsShortcut {
-        title: C_("shortcuts window", "Show hidden games");
+        title: _("Show hidden games");
         action-name: "win.show_hidden";
       }
     }
diff --git a/po/cartridges.pot b/po/cartridges.pot
index 8079043..840daac 100644
--- a/po/cartridges.pot
+++ b/po/cartridges.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cartridges\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-29 08:08+0200\n"
+"POT-Creation-Date: 2023-03-29 08:15+0200\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"
@@ -104,7 +104,7 @@ msgstr ""
 msgid "Main Menu"
 msgstr ""
 
-#: data/gtk/window.blp:210 data/gtk/window.blp:273
+#: data/gtk/window.blp:210 data/gtk/window.blp:273 data/gtk/help-overlay.blp:19
 msgid "Search"
 msgstr ""
 
@@ -172,65 +172,46 @@ msgstr ""
 msgid "Unhide"
 msgstr ""
 
-#: data/gtk/help-overlay.blp:11
-msgctxt "shortcuts window"
+#: data/gtk/help-overlay.blp:11 data/gtk/preferences.blp:9
 msgid "General"
 msgstr ""
 
 #: data/gtk/help-overlay.blp:14
-msgctxt "shortcuts window"
 msgid "Quit"
 msgstr ""
 
-#: data/gtk/help-overlay.blp:19
-msgctxt "shortcuts window"
-msgid "Search"
-msgstr ""
-
 #: data/gtk/help-overlay.blp:24
-msgctxt "shortcuts window"
 msgid "Show preferences"
 msgstr ""
 
 #: data/gtk/help-overlay.blp:29
-msgctxt "shortcuts window"
 msgid "Shortcuts"
 msgstr ""
 
-#: data/gtk/help-overlay.blp:34
-msgctxt "shortcuts window"
+#: data/gtk/help-overlay.blp:34 src/main.py:199
 msgid "Undo"
 msgstr ""
 
 #: data/gtk/help-overlay.blp:39
-msgctxt "shortcuts window"
 msgid "Open menu"
 msgstr ""
 
 #: data/gtk/help-overlay.blp:45
-msgctxt "shortcuts window"
 msgid "Games"
 msgstr ""
 
 #: data/gtk/help-overlay.blp:48
-msgctxt "shortcuts window"
 msgid "Add new game"
 msgstr ""
 
 #: data/gtk/help-overlay.blp:53
-msgctxt "shortcuts window"
 msgid "Import games"
 msgstr ""
 
 #: data/gtk/help-overlay.blp:58
-msgctxt "shortcuts window"
 msgid "Show hidden games"
 msgstr ""
 
-#: data/gtk/preferences.blp:9
-msgid "General"
-msgstr ""
-
 #: data/gtk/preferences.blp:13
 msgid "Behavior"
 msgstr ""
@@ -326,10 +307,6 @@ msgstr ""
 msgid "{title} removed"
 msgstr ""
 
-#: src/main.py:199
-msgid "Undo"
-msgstr ""
-
 #: src/window.py:234
 msgid "Today"
 msgstr ""
diff --git a/src/utils/importer.py b/src/utils/importer.py
index 6623c6d..5fb8f97 100644
--- a/src/utils/importer.py
+++ b/src/utils/importer.py
@@ -29,7 +29,7 @@ class Importer:
         self.parent_widget = parent_widget
         self.total_queue = 0
         self.queue = 0
-        self.imported_no = 0
+        self.games_no = 0
         self.blocker = False
 
         self.progressbar = Gtk.ProgressBar(margin_start=12, margin_end=12)
@@ -54,7 +54,7 @@ class Importer:
 
     def save_game(self, values=None):
         if values:
-            self.imported_no += 1
+            self.games_no += 1
             save_game(values)
             self.parent_widget.update_games([values["game_id"]])
 
@@ -70,7 +70,7 @@ class Importer:
                         None, page_name="import"
                     )
 
-            if self.imported_no == 0:
+            if self.games_no == 0:
                 create_dialog(
                     self.parent_widget,
                     _("No Games Found"),
@@ -79,14 +79,14 @@ class Importer:
                     _("Preferences"),
                 ).connect("response", response)
 
-            elif self.imported_no == 1:
+            elif self.games_no == 1:
                 create_dialog(
                     self.parent_widget,
                     _("Game Imported"),
                     _("Successfully imported 1 game."),
                 )
-            elif self.imported_no > 1:
-                imported_no = self.imported_no
+            elif self.games_no > 1:
+                imported_no = self.games_no
                 create_dialog(
                     self.parent_widget,
                     _("Games Imported"),