Merge pull request #480 from dschemp/develop

launcher/ui/MainWindow.cpp

@@ -294,14 +294,14 @@ public:
         actionViewInstanceFolder = TranslatedAction(MainWindow);
         actionViewInstanceFolder->setObjectName(QStringLiteral("actionViewInstanceFolder"));
         actionViewInstanceFolder->setIcon(APPLICATION->getThemedIcon("viewfolder"));
-        actionViewInstanceFolder.setTextId(QT_TRANSLATE_NOOP("MainWindow", "View Instance Folder"));
+        actionViewInstanceFolder.setTextId(QT_TRANSLATE_NOOP("MainWindow", "&View Instance Folder"));
         actionViewInstanceFolder.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the instance folder in a file browser."));
         all_actions.append(&actionViewInstanceFolder);
 
         actionViewCentralModsFolder = TranslatedAction(MainWindow);
         actionViewCentralModsFolder->setObjectName(QStringLiteral("actionViewCentralModsFolder"));
         actionViewCentralModsFolder->setIcon(APPLICATION->getThemedIcon("centralmods"));
-        actionViewCentralModsFolder.setTextId(QT_TRANSLATE_NOOP("MainWindow", "View Central Mods Folder"));
+        actionViewCentralModsFolder.setTextId(QT_TRANSLATE_NOOP("MainWindow", "View &Central Mods Folder"));
         actionViewCentralModsFolder.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the central mods folder in a file browser."));
         all_actions.append(&actionViewCentralModsFolder);
 
@@ -326,7 +326,7 @@ public:
         actionSettings->setObjectName(QStringLiteral("actionSettings"));
         actionSettings->setIcon(APPLICATION->getThemedIcon("settings"));
         actionSettings->setMenuRole(QAction::PreferencesRole);
-        actionSettings.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Settings..."));
+        actionSettings.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Setti&ngs..."));
         actionSettings.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Change settings."));
         actionSettings->setShortcut(QKeySequence::Preferences);
         all_actions.append(&actionSettings);
@@ -542,7 +542,7 @@ public:
 
         actionOpenWiki = TranslatedAction(MainWindow);
         actionOpenWiki->setObjectName(QStringLiteral("actionOpenWiki"));
-        actionOpenWiki.setTextId(QT_TRANSLATE_NOOP("MainWindow", "%1 He&lp"));
+        actionOpenWiki.setTextId(QT_TRANSLATE_NOOP("MainWindow", "%1 &Help"));
         actionOpenWiki.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the %1 wiki"));
         connect(actionOpenWiki, &QAction::triggered, MainWindow, &MainWindow::on_actionOpenWiki_triggered);
         all_actions.append(&actionOpenWiki);

launcher/ui/pages/global/APIPage.ui

@@ -36,7 +36,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox_paste">
          <property name="title">
-          <string>Pastebin URL</string>
+          <string>&amp;Pastebin URL</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
@@ -98,7 +98,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox_msa">
          <property name="title">
-          <string>Microsoft Authentication</string>
+          <string>&amp;Microsoft Authentication</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>

launcher/ui/pages/global/AccountListPage.ui

@@ -65,17 +65,17 @@
   </widget>
   <action name="actionAddMojang">
    <property name="text">
-    <string>Add Mojang</string>
+    <string>Add &amp;Mojang</string>
    </property>
   </action>
   <action name="actionRemove">
    <property name="text">
-    <string>Remove</string>
+    <string>Remo&amp;ve</string>
    </property>
   </action>
   <action name="actionSetDefault">
    <property name="text">
-    <string>Set Default</string>
+    <string>&amp;Set Default</string>
    </property>
   </action>
   <action name="actionNoDefault">
@@ -83,17 +83,17 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>No Default</string>
+    <string>&amp;No Default</string>
    </property>
   </action>
   <action name="actionUploadSkin">
    <property name="text">
-    <string>Upload Skin</string>
+    <string>&amp;Upload Skin</string>
    </property>
   </action>
   <action name="actionDeleteSkin">
    <property name="text">
-    <string>Delete Skin</string>
+    <string>&amp;Delete Skin</string>
    </property>
    <property name="toolTip">
     <string>Delete the currently active skin and go back to the default one</string>
@@ -101,17 +101,17 @@
   </action>
   <action name="actionAddMicrosoft">
    <property name="text">
-    <string>Add Microsoft</string>
+    <string>&amp;Add Microsoft</string>
    </property>
   </action>
   <action name="actionAddOffline">
    <property name="text">
-    <string>Add Offline</string>
+    <string>Add &amp;Offline</string>
    </property>
   </action>
   <action name="actionRefresh">
    <property name="text">
-    <string>Refresh</string>
+    <string>&amp;Refresh</string>
    </property>
    <property name="toolTip">
     <string>Refresh the account tokens</string>

launcher/ui/pages/global/ExternalToolsPage.ui

@@ -36,7 +36,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
-          <string notr="true">JProfiler</string>
+          <string notr="true">J&amp;Profiler</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_10">
           <item>
@@ -73,7 +73,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
-          <string notr="true">JVisualVM</string>
+          <string notr="true">J&amp;VisualVM</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_11">
           <item>
@@ -110,7 +110,7 @@
        <item>
         <widget class="QGroupBox" name="groupBox_4">
          <property name="title">
-          <string notr="true">MCEdit</string>
+          <string notr="true">&amp;MCEdit</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_12">
           <item>
@@ -156,7 +156,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="labelJsonEditor">
             <property name="text">
-             <string>Text Editor:</string>
+             <string>&amp;Text Editor:</string>
             </property>
            </widget>
           </item>

launcher/ui/pages/global/JavaPage.ui

@@ -70,14 +70,14 @@
           <item row="0" column="0">
            <widget class="QLabel" name="labelMinMem">
             <property name="text">
-             <string>Minimum memory allocation:</string>
+             <string>&amp;Minimum memory allocation:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="labelMaxMem">
             <property name="text">
-             <string>Maximum memory allocation:</string>
+             <string>Ma&amp;ximum memory allocation:</string>
             </property>
            </widget>
           </item>
@@ -106,7 +106,7 @@
           <item row="2" column="0">
            <widget class="QLabel" name="labelPermGen">
             <property name="text">
-             <string notr="true">PermGen:</string>
+             <string notr="true">&amp;PermGen:</string>
             </property>
            </widget>
           </item>
@@ -150,7 +150,7 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Java path:</string>
+             <string>&amp;Java path:</string>
             </property>
            </widget>
           </item>
@@ -192,7 +192,7 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>JVM arguments:</string>
+             <string>J&amp;VM arguments:</string>
             </property>
            </widget>
           </item>
@@ -205,7 +205,7 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Auto-detect...</string>
+             <string>&amp;Auto-detect...</string>
             </property>
            </widget>
           </item>
@@ -218,7 +218,7 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Test</string>
+             <string>&amp;Test</string>
             </property>
            </widget>
           </item>
@@ -234,7 +234,7 @@
              <string>If enabled, the launcher will not check if an instance is compatible with the selected Java version.</string>
             </property>
             <property name="text">
-             <string>Skip Java compatibility checks</string>
+             <string>&amp;Skip Java compatibility checks</string>
             </property>
            </widget>
           </item>

launcher/ui/pages/global/LauncherPage.ui

@@ -196,7 +196,7 @@
           <item>
            <widget class="QRadioButton" name="sortLastLaunchedBtn">
             <property name="text">
-             <string>By &amp;last launched</string>
+             <string>&amp;By last launched</string>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">sortingModeGroup</string>
@@ -293,7 +293,7 @@
           <item row="1" column="0">
            <widget class="QLabel" name="label_4">
             <property name="text">
-             <string>Colors</string>
+             <string>&amp;Colors</string>
             </property>
             <property name="buddy">
              <cstring>themeComboBoxColors</cstring>
@@ -334,7 +334,7 @@
              <string>The menubar is more friendly for keyboard-driven interaction.</string>
             </property>
             <property name="text">
-             <string>Replace toolbar with menubar</string>
+             <string>&amp;Replace toolbar with menubar</string>
             </property>
            </widget>
           </item>
@@ -370,21 +370,21 @@
           <item>
            <widget class="QCheckBox" name="showConsoleCheck">
             <property name="text">
-             <string>Show console while the game is running?</string>
+             <string>Show console while the game is &amp;running?</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="autoCloseConsoleCheck">
             <property name="text">
-             <string>Automatically close console when the game quits?</string>
+             <string>&amp;Automatically close console when the game quits?</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="showConsoleErrorCheck">
             <property name="text">
-             <string>Show console when the game crashes?</string>
+             <string>Show console when the game &amp;crashes?</string>
             </property>
            </widget>
           </item>
@@ -394,13 +394,13 @@
        <item>
         <widget class="QGroupBox" name="groupBox_4">
          <property name="title">
-          <string>History limit</string>
+          <string>&amp;History limit</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_3">
           <item row="1" column="0">
            <widget class="QCheckBox" name="checkStopLogging">
             <property name="text">
-             <string>Stop logging when log overflows</string>
+             <string>&amp;Stop logging when log overflows</string>
             </property>
            </widget>
           </item>
@@ -441,7 +441,7 @@
           </sizepolicy>
          </property>
          <property name="title">
-          <string>Console font</string>
+          <string>Console &amp;font</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
           <item row="1" column="0" colspan="2">

launcher/ui/pages/global/MinecraftPage.ui

@@ -51,7 +51,7 @@
           <item>
            <widget class="QCheckBox" name="maximizedCheckBox">
             <property name="text">
-             <string>Start Minecraft maximized?</string>
+             <string>Start Minecraft &amp;maximized?</string>
             </property>
            </widget>
           </item>
@@ -60,7 +60,7 @@
             <item row="1" column="0">
              <widget class="QLabel" name="labelWindowHeight">
               <property name="text">
-               <string>Window hei&amp;ght:</string>
+               <string>Window &amp;height:</string>
               </property>
               <property name="buddy">
                <cstring>windowHeightSpinBox</cstring>
@@ -70,7 +70,7 @@
             <item row="0" column="0">
              <widget class="QLabel" name="labelWindowWidth">
               <property name="text">
-               <string>W&amp;indow width:</string>
+               <string>Window &amp;width:</string>
               </property>
               <property name="buddy">
                <cstring>windowWidthSpinBox</cstring>
@@ -120,14 +120,14 @@
           <item>
            <widget class="QCheckBox" name="useNativeGLFWCheck">
             <property name="text">
-             <string>Use system installation of GLFW</string>
+             <string>Use system installation of &amp;GLFW</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="useNativeOpenALCheck">
             <property name="text">
-             <string>Use system installation of OpenAL</string>
+             <string>Use system installation of &amp;OpenAL</string>
             </property>
            </widget>
           </item>
@@ -143,21 +143,21 @@
           <item>
            <widget class="QCheckBox" name="showGameTime">
             <property name="text">
-             <string>Show time spent playing instances</string>
+             <string>Show time spent &amp;playing instances</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="showGlobalGameTime">
             <property name="text">
-             <string>Show time spent playing across all instances</string>
+             <string>Show time spent playing across &amp;all instances</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="recordGameTime">
             <property name="text">
-             <string>Record time spent playing instances</string>
+             <string>&amp;Record time spent playing instances</string>
             </property>
            </widget>
           </item>
@@ -176,7 +176,7 @@
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The launcher will automatically reopen when the game crashes or exits.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
-             <string>Close the launcher after game window opens</string>
+             <string>&amp;Close the launcher after game window opens</string>
             </property>
            </widget>
           </item>
@@ -186,7 +186,7 @@
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The launcher will automatically quit after the game exits or crashes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="text">
-              <string>Quit the launcher after game window closes</string>
+              <string>&amp;Quit the launcher after game window closes</string>
              </property>
             </widget>
            </item>

launcher/ui/pages/global/ProxyPage.ui

@@ -81,7 +81,7 @@
           <item>
            <widget class="QRadioButton" name="proxySOCKS5Btn">
             <property name="text">
-             <string>SOC&amp;KS5</string>
+             <string>&amp;SOCKS5</string>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">proxyGroup</string>
@@ -91,7 +91,7 @@
           <item>
            <widget class="QRadioButton" name="proxyHTTPBtn">
             <property name="text">
-             <string>H&amp;TTP</string>
+             <string>&amp;HTTP</string>
             </property>
             <attribute name="buttonGroup">
              <string notr="true">proxyGroup</string>
@@ -104,7 +104,7 @@
        <item>
         <widget class="QGroupBox" name="proxyAddrBox">
          <property name="title">
-          <string>Address and Port</string>
+          <string>&amp;Address and Port</string>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
@@ -145,14 +145,14 @@
           <item row="0" column="0">
            <widget class="QLabel" name="proxyUsernameLabel">
             <property name="text">
-             <string>Username:</string>
+             <string>&amp;Username:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="proxyPasswordLabel">
             <property name="text">
-             <string>Password:</string>
+             <string>&amp;Password:</string>
             </property>
            </widget>
           </item>

launcher/ui/widgets/CustomCommands.ui

@@ -29,7 +29,7 @@
       <bool>true</bool>
      </property>
      <property name="title">
-      <string>Cus&amp;tom Commands</string>
+      <string>&amp;Custom Commands</string>
      </property>
      <property name="checkable">
       <bool>true</bool>
@@ -41,7 +41,7 @@
       <item row="2" column="0">
        <widget class="QLabel" name="labelPostExitCmd">
         <property name="text">
-         <string>Post-exit command:</string>
+         <string>P&amp;ost-exit command:</string>
         </property>
        </widget>
       </item>
@@ -51,7 +51,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="labelPreLaunchCmd">
         <property name="text">
-         <string>Pre-launch command:</string>
+         <string>&amp;Pre-launch command:</string>
         </property>
        </widget>
       </item>
@@ -61,7 +61,7 @@
       <item row="1" column="0">
        <widget class="QLabel" name="labelWrapperCmd">
         <property name="text">
-         <string>Wrapper command:</string>
+         <string>&amp;Wrapper command:</string>
         </property>
        </widget>
       </item>