diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index cd75a2bf..49984ea2 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -705,43 +705,43 @@ class AppWindow(object):
         self.cmdr_label['text'] = _('Cmdr') + ':'  # LANG: Label for commander name in main window
         # LANG: 'Ship' or multi-crew role label in main window, as applicable
         self.ship_label['text'] = (monitor.state['Captain'] and _('Role') or _('Ship')) + ':'  # Main window
-        self.suit_label['text'] = _('Suit') + ':'  # LANG: Main window
-        self.system_label['text'] = _('System') + ':'  # LANG: Main window
-        self.station_label['text'] = _('Station') + ':'  # LANG: Main window
+        self.suit_label['text'] = _('Suit') + ':'  # LANG: Label for 'Suit' line in main UI
+        self.system_label['text'] = _('System') + ':'  # LANG: Label for 'System' line in main UI
+        self.station_label['text'] = _('Station') + ':'  # LANG: Label for 'Station' line in main UI
         self.button['text'] = self.theme_button['text'] = _('Update')  # LANG: Update button in main window
         if platform == 'darwin':
-            self.menubar.entryconfigure(1, label=_('File'))  # LANG: Menu title on OSX
-            self.menubar.entryconfigure(2, label=_('Edit'))  # LANG: Menu title on OSX
-            self.menubar.entryconfigure(3, label=_('View'))  # LANG: Menu title on OSX
-            self.menubar.entryconfigure(4, label=_('Window'))  # LANG: Menu title on OSX
-            self.menubar.entryconfigure(5, label=_('Help'))  # LANG: Menu title on OSX
+            self.menubar.entryconfigure(1, label=_('File'))  # LANG: 'File' menu title on OSX
+            self.menubar.entryconfigure(2, label=_('Edit'))  # LANG: 'Edit' menu title on OSX
+            self.menubar.entryconfigure(3, label=_('View'))  # LANG: 'View' menu title on OSX
+            self.menubar.entryconfigure(4, label=_('Window'))  # LANG: 'Window' menu title on OSX
+            self.menubar.entryconfigure(5, label=_('Help'))  # LANG: Help' menu title on OSX
             self.system_menu.entryconfigure(0, label=_("About {APP}").format(
                 APP=applongname))  # LANG: App menu entry on OSX
-            self.system_menu.entryconfigure(1, label=_("Check for Updates..."))  # LANG: Menu item
-            self.file_menu.entryconfigure(0, label=_('Save Raw Data...'))  # LANG: Menu item
-            self.view_menu.entryconfigure(0, label=_('Status'))  # LANG: Menu item
-            self.help_menu.entryconfigure(1, label=_('Privacy Policy'))  # LANG: Help menu item
-            self.help_menu.entryconfigure(2, label=_('Release Notes'))  # LANG: Help menu item
+            self.system_menu.entryconfigure(1, label=_("Check for Updates..."))  # LANG: Help > Check for Updates
+            self.file_menu.entryconfigure(0, label=_('Save Raw Data...'))  # LANG: File > Save Raw Data...
+            self.view_menu.entryconfigure(0, label=_('Status'))  # LANG: File > Status
+            self.help_menu.entryconfigure(1, label=_('Privacy Policy'))  # LANG: Help > Privacy Policy
+            self.help_menu.entryconfigure(2, label=_('Release Notes'))  # LANG: Help > Release Notes
         else:
-            self.menubar.entryconfigure(1, label=_('File'))  # LANG: Menu title
-            self.menubar.entryconfigure(2, label=_('Edit'))  # LANG: Menu title
-            self.menubar.entryconfigure(3, label=_('Help'))  # LANG: Menu title
-            self.theme_file_menu['text'] = _('File')  # LANG: Menu title
-            self.theme_edit_menu['text'] = _('Edit')  # LANG: Menu title
-            self.theme_help_menu['text'] = _('Help')  # LANG: Menu title
+            self.menubar.entryconfigure(1, label=_('File'))  # LANG: 'File' menu title
+            self.menubar.entryconfigure(2, label=_('Edit'))  # LANG: 'Edit' menu title
+            self.menubar.entryconfigure(3, label=_('Help'))  # LANG: 'Help' menu title
+            self.theme_file_menu['text'] = _('File')  # LANG: 'File' menu title
+            self.theme_edit_menu['text'] = _('Edit')  # LANG: 'Edit' menu title
+            self.theme_help_menu['text'] = _('Help')  # LANG: 'Help' menu title
 
             # File menu
-            self.file_menu.entryconfigure(0, label=_('Status'))  # LANG: Menu item
-            self.file_menu.entryconfigure(1, label=_('Save Raw Data...'))  # LANG: Menu item
-            self.file_menu.entryconfigure(2, label=_('Settings'))  # LANG: Item in the File menu on Windows
-            self.file_menu.entryconfigure(4, label=_('Exit'))  # LANG: Item in the File menu on Windows
+            self.file_menu.entryconfigure(0, label=_('Status'))  # LANG: File > Status
+            self.file_menu.entryconfigure(1, label=_('Save Raw Data...'))  # LANG: File > Save Raw Data...
+            self.file_menu.entryconfigure(2, label=_('Settings'))  # LANG: File > Settings (Windows)
+            self.file_menu.entryconfigure(4, label=_('Exit'))  # LANG: File > Exit
 
             # Help menu
-            self.help_menu.entryconfigure(0, label=_('Documentation'))  # LANG: Help menu item
-            self.help_menu.entryconfigure(1, label=_('Privacy Policy'))  # LANG: Help menu item
-            self.help_menu.entryconfigure(2, label=_('Release Notes'))  # LANG: Help menu item
-            self.help_menu.entryconfigure(3, label=_('Check for Updates...'))  # LANG: Menu item
-            self.help_menu.entryconfigure(4, label=_("About {APP}").format(APP=applongname))  # LANG: App menu entry
+            self.help_menu.entryconfigure(0, label=_('Documentation'))  # LANG: Help > Documentation
+            self.help_menu.entryconfigure(1, label=_('Privacy Policy'))  # LANG: Help > Privacy Policy
+            self.help_menu.entryconfigure(2, label=_('Release Notes'))  # LANG: Help > Release Notes
+            self.help_menu.entryconfigure(3, label=_('Check for Updates...'))  # LANG: Help > Check for Updates...
+            self.help_menu.entryconfigure(4, label=_("About {APP}").format(APP=applongname))  # LANG: Help > About App
 
         # Edit menu
         self.edit_menu.entryconfigure(0, label=_('Copy'))  # LANG: As in Copy and Paste
@@ -1042,7 +1042,7 @@ class AppWindow(object):
                 else:
                     self.cmdr['text'] = monitor.cmdr
 
-                self.ship_label['text'] = _('Ship') + ':'  # LANG: Main window
+                self.ship_label['text'] = _('Ship') + ':'  # LANG: 'Ship' label in main UI
 
                 # TODO: Show something else when on_foot
                 if monitor.state['ShipName']:
@@ -1065,7 +1065,7 @@ class AppWindow(object):
 
             else:
                 self.cmdr['text'] = ''
-                self.ship_label['text'] = _('Ship') + ':'  # LANG: Main window
+                self.ship_label['text'] = _('Ship') + ':'  # LANG: 'Ship' label in main UI
                 self.ship['text'] = ''
 
             if monitor.cmdr and monitor.is_beta:
@@ -1739,7 +1739,7 @@ sys.path: {sys.path}'''
             )
 
             # Substitute in the other words.
-            # LANG: words for use in python 2 plugin error
+            # LANG: 'Plugins' tab / 'File' menu / 'File' > 'Settings'
             popup_text = popup_text.format(PLUGINS=_('Plugins'), FILE=_('File'), SETTINGS=_('Settings'),
                                            DISABLED='.disabled')
             # And now we do need these to be actual \r\n