From a41c26e9cdab5050181354c1fc3c67bc51d49a26 Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sun, 10 Nov 2019 08:34:59 -0500
Subject: [PATCH] Cleanup UI files

Removes unnecessary &amp; from strings in settings widgets. These cause confusion and complicate translation. They are unnecessary as all dialogs allow efficient tabbing between elements.

Also add colons after several settings with input boxes and remove a hard stop.

Improve wording of strings based on translator feedback.

Fix case sensitive matching of CLI Export.
---
 src/browser/BrowserOptionDialog.ui            | 44 +++++++++----------
 src/cli/Export.cpp                            | 14 +++---
 src/cli/Import.cpp                            |  2 +-
 .../DatabaseSettingsWidgetFdoSecrets.cpp      |  3 +-
 .../DatabaseSettingsWidgetFdoSecrets.ui       |  4 +-
 .../widgets/SettingsWidgetFdoSecrets.ui       |  2 +-
 src/gui/ApplicationSettingsWidgetGeneral.ui   | 16 +++----
 src/gui/EditWidgetIcons.ui                    |  6 +--
 src/gui/PasswordGeneratorWidget.ui            |  2 +-
 .../DatabaseSettingsWidgetBrowser.ui          |  6 +--
 .../DatabaseSettingsWidgetGeneral.ui          |  2 +-
 src/gui/entry/EditEntryWidget.cpp             |  6 +--
 src/gui/entry/EditEntryWidgetAutoType.ui      |  4 +-
 src/gui/group/EditGroupWidgetMain.ui          |  4 +-
 src/gui/wizard/NewDatabaseWizardPage.ui       |  2 +-
 src/keeshare/group/EditGroupWidgetKeeShare.ui |  4 +-
 16 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/src/browser/BrowserOptionDialog.ui b/src/browser/BrowserOptionDialog.ui
index 1c00da148..9dabde948 100755
--- a/src/browser/BrowserOptionDialog.ui
+++ b/src/browser/BrowserOptionDialog.ui
@@ -110,7 +110,7 @@
           <item row="0" column="0">
            <widget class="QCheckBox" name="chromeSupport">
             <property name="text">
-             <string>&amp;Google Chrome</string>
+             <string>Google Chrome</string>
             </property>
             <property name="checked">
              <bool>false</bool>
@@ -120,7 +120,7 @@
           <item row="0" column="1">
            <widget class="QCheckBox" name="firefoxSupport">
             <property name="text">
-             <string>&amp;Firefox</string>
+             <string>Firefox</string>
             </property>
             <property name="checked">
              <bool>false</bool>
@@ -130,7 +130,7 @@
           <item row="1" column="0">
            <widget class="QCheckBox" name="chromiumSupport">
             <property name="text">
-             <string>&amp;Chromium</string>
+             <string>Chromium</string>
             </property>
             <property name="checked">
              <bool>false</bool>
@@ -140,7 +140,7 @@
           <item row="1" column="1">
            <widget class="QCheckBox" name="vivaldiSupport">
             <property name="text">
-             <string>&amp;Vivaldi</string>
+             <string>Vivaldi</string>
             </property>
             <property name="checked">
              <bool>false</bool>
@@ -150,7 +150,7 @@
           <item row="0" column="2">
            <widget class="QCheckBox" name="torBrowserSupport">
             <property name="text">
-             <string>&amp;Tor Browser</string>
+             <string>Tor Browser</string>
             </property>
             <property name="checked">
              <bool>false</bool>
@@ -160,7 +160,7 @@
           <item row="1" column="2">
            <widget class="QCheckBox" name="braveSupport">
             <property name="text">
-             <string>&amp;Brave</string>
+             <string>Brave</string>
             </property>
             <property name="checked">
              <bool>false</bool>
@@ -199,7 +199,7 @@
        <item>
         <widget class="QCheckBox" name="showNotification">
          <property name="text">
-          <string extracomment="Credentials mean login data requested via browser extension">Show a &amp;notification when credentials are requested</string>
+          <string extracomment="Credentials mean login data requested via browser extension">Show a notification when credentials are requested</string>
          </property>
          <property name="checked">
           <bool>true</bool>
@@ -209,7 +209,7 @@
        <item>
         <widget class="QCheckBox" name="unlockDatabase">
          <property name="text">
-          <string>Re&amp;quest to unlock the database if it is locked</string>
+          <string>Request to unlock the database if it is locked</string>
          </property>
          <property name="checked">
           <bool>true</bool>
@@ -222,7 +222,7 @@
           <string>Only entries with the same scheme (http://, https://, ...) are returned.</string>
          </property>
          <property name="text">
-          <string>&amp;Match URL scheme (e.g., https://...)</string>
+          <string>Match URL scheme (e.g., https://...)</string>
          </property>
         </widget>
        </item>
@@ -232,7 +232,7 @@
           <string>Only returns the best matches for a specific URL instead of all entries for the whole domain.</string>
          </property>
          <property name="text">
-          <string>&amp;Return only best-matching credentials</string>
+          <string>Return only best-matching credentials</string>
          </property>
         </widget>
        </item>
@@ -242,21 +242,21 @@
           <string>Returns expired credentials. String [expired] is added to the title.</string>
          </property>
          <property name="text">
-          <string>&amp;Allow returning expired credentials.</string>
+          <string>Allow returning expired credentials</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QRadioButton" name="sortByTitle">
          <property name="text">
-          <string extracomment="Credentials mean login data requested via browser extension">Sort &amp;matching credentials by title</string>
+          <string extracomment="Credentials mean login data requested via browser extension">Sort matching credentials by title</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QRadioButton" name="sortByUsername">
          <property name="text">
-          <string extracomment="Credentials mean login data requested via browser extension">Sort matching credentials by &amp;username</string>
+          <string extracomment="Credentials mean login data requested via browser extension">Sort matching credentials by username</string>
          </property>
         </widget>
        </item>
@@ -293,21 +293,21 @@
        <item>
         <widget class="QCheckBox" name="alwaysAllowAccess">
          <property name="text">
-          <string extracomment="Credentials mean login data requested via browser extension">Never &amp;ask before accessing credentials</string>
+          <string extracomment="Credentials mean login data requested via browser extension">Never ask before accessing credentials</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="alwaysAllowUpdate">
          <property name="text">
-          <string extracomment="Credentials mean login data requested via browser extension">Never ask before &amp;updating credentials</string>
+          <string extracomment="Credentials mean login data requested via browser extension">Never ask before updating credentials</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="httpAuthPermission">
          <property name="text">
-          <string extracomment="An extra HTTP Basic Auth setting">Do not ask permission for HTTP &amp;Basic Auth</string>
+          <string extracomment="An extra HTTP Basic Auth setting">Do not ask permission for HTTP Basic Auth</string>
          </property>
         </widget>
        </item>
@@ -317,7 +317,7 @@
           <string>All databases connected to the extension will return matching credentials.</string>
          </property>
          <property name="text">
-          <string extracomment="Credentials mean login data requested via browser extension">Searc&amp;h in all opened databases for matching credentials</string>
+          <string extracomment="Credentials mean login data requested via browser extension">Search in all opened databases for matching credentials</string>
          </property>
         </widget>
        </item>
@@ -327,7 +327,7 @@
           <string>Automatically creating or updating string fields is not supported.</string>
          </property>
          <property name="text">
-          <string>&amp;Return advanced string fields which start with &quot;KPH: &quot;</string>
+          <string>Return advanced string fields which start with &quot;KPH: &quot;</string>
          </property>
         </widget>
        </item>
@@ -337,7 +337,7 @@
           <string>Don't display the popup suggesting migration of legacy KeePassHTTP settings.</string>
          </property>
          <property name="text">
-          <string>&amp;Do not prompt for KeePassHTTP settings migration.</string>
+          <string>Do not prompt for KeePassHTTP settings migration.</string>
          </property>
         </widget>
        </item>
@@ -347,7 +347,7 @@
           <string>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</string>
          </property>
          <property name="text">
-          <string>Update &amp;native messaging manifest files at startup</string>
+          <string>Update native messaging manifest files at startup</string>
          </property>
         </widget>
        </item>
@@ -357,7 +357,7 @@
           <string>Support a proxy application between KeePassXC and browser extension.</string>
          </property>
          <property name="text">
-          <string>Use a &amp;proxy application between KeePassXC and browser extension</string>
+          <string>Use a proxy application between KeePassXC and browser extension</string>
          </property>
         </widget>
        </item>
@@ -367,7 +367,7 @@
           <string>Use a custom proxy location if you installed a proxy manually.</string>
          </property>
          <property name="text">
-          <string comment="Meant is the proxy for KeePassXC-Browser">Use a &amp;custom proxy location</string>
+          <string comment="Meant is the proxy for KeePassXC-Browser">Use a custom proxy location</string>
          </property>
         </widget>
        </item>
diff --git a/src/cli/Export.cpp b/src/cli/Export.cpp
index 8f63323d7..e856f5332 100644
--- a/src/cli/Export.cpp
+++ b/src/cli/Export.cpp
@@ -25,11 +25,11 @@
 #include "core/Database.h"
 #include "format/CsvExporter.h"
 
-const QCommandLineOption Export::FormatOption =
-    QCommandLineOption(QStringList() << "f"
-                                     << "format",
-                       QObject::tr("Format to use when exporting. Available choices are xml or csv. Defaults to xml."),
-                       QStringLiteral("xml|csv"));
+const QCommandLineOption Export::FormatOption = QCommandLineOption(
+    QStringList() << "f"
+                  << "format",
+    QObject::tr("Format to use when exporting. Available choices are 'xml' or 'csv'. Defaults to 'xml'."),
+    QStringLiteral("xml|csv"));
 
 Export::Export()
 {
@@ -44,7 +44,7 @@ int Export::executeWithDatabase(QSharedPointer<Database> database, QSharedPointe
     TextStream errorTextStream(Utils::STDERR, QIODevice::WriteOnly);
 
     QString format = parser->value(Export::FormatOption);
-    if (format.isEmpty() || format == QStringLiteral("xml")) {
+    if (format.isEmpty() || format.startsWith(QStringLiteral("xml"), Qt::CaseInsensitive)) {
         QByteArray xmlData;
         QString errorMessage;
         if (!database->extract(xmlData, &errorMessage)) {
@@ -52,7 +52,7 @@ int Export::executeWithDatabase(QSharedPointer<Database> database, QSharedPointe
             return EXIT_FAILURE;
         }
         outputTextStream << xmlData.constData() << endl;
-    } else if (format == QStringLiteral("csv")) {
+    } else if (format.startsWith(QStringLiteral("csv"), Qt::CaseInsensitive)) {
         CsvExporter csvExporter;
         outputTextStream << csvExporter.exportDatabase(database);
     } else {
diff --git a/src/cli/Import.cpp b/src/cli/Import.cpp
index 0907f00ab..dd7b12c64 100644
--- a/src/cli/Import.cpp
+++ b/src/cli/Import.cpp
@@ -86,7 +86,7 @@ int Import::execute(const QStringList& arguments)
     db.setKey(key);
 
     if (!db.import(xmlExportPath, &errorMessage)) {
-        errorTextStream << QObject::tr("Unable to import XML database export %1").arg(errorMessage) << endl;
+        errorTextStream << QObject::tr("Unable to import XML database: %1").arg(errorMessage) << endl;
         return EXIT_FAILURE;
     }
 
diff --git a/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.cpp b/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.cpp
index 16a780de7..7c7e3abe5 100644
--- a/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.cpp
+++ b/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.cpp
@@ -168,8 +168,7 @@ void DatabaseSettingsWidgetFdoSecrets::settingsWarning()
         m_ui->warningWidget->hideMessage();
     } else {
         m_ui->groupBox->setEnabled(false);
-        m_ui->warningWidget->showMessage(tr("Enable fd.o Secret Service to access these settings."),
-                                         MessageWidget::Warning);
+        m_ui->warningWidget->showMessage(tr("Enable Secret Service to access these settings."), MessageWidget::Warning);
         m_ui->warningWidget->setCloseButtonVisible(false);
         m_ui->warningWidget->setAutoHideTimeout(-1);
     }
diff --git a/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.ui b/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.ui
index 6bacb32b6..7eb21705a 100644
--- a/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.ui
+++ b/src/fdosecrets/widgets/DatabaseSettingsWidgetFdoSecrets.ui
@@ -23,7 +23,7 @@
       <item>
        <widget class="QRadioButton" name="radioDonotExpose">
         <property name="text">
-         <string>Don't e&amp;xpose this database</string>
+         <string>Don't expose this database</string>
         </property>
         <property name="checked">
          <bool>true</bool>
@@ -36,7 +36,7 @@
       <item>
        <widget class="QRadioButton" name="radioExpose">
         <property name="text">
-         <string>Expose entries &amp;under this group:</string>
+         <string>Expose entries under this group:</string>
         </property>
         <attribute name="buttonGroup">
          <string notr="true">buttonGroup</string>
diff --git a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui
index 660181f5d..cfbeaa210 100644
--- a/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui
+++ b/src/fdosecrets/widgets/SettingsWidgetFdoSecrets.ui
@@ -47,7 +47,7 @@
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If recycle bin is enabled for the database, entries will be moved to recycle bin directly. Otherwise, they will be deleted without confirmation.&lt;/p&gt;&lt;p&gt;You will still be prompted if any entries are referenced by others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="text">
-          <string>Don't confirm when entries are deleted by clients.</string>
+          <string>Don't confirm when entries are deleted by clients</string>
          </property>
         </widget>
        </item>
diff --git a/src/gui/ApplicationSettingsWidgetGeneral.ui b/src/gui/ApplicationSettingsWidgetGeneral.ui
index 3c6de499a..fa4da2acc 100644
--- a/src/gui/ApplicationSettingsWidgetGeneral.ui
+++ b/src/gui/ApplicationSettingsWidgetGeneral.ui
@@ -57,11 +57,11 @@
            </widget>
           </item>
           <item>
-            <widget class="QCheckBox" name="minimizeAfterUnlockCheckBox">
-              <property name="text">
-                <string>Minimize window after unlocking database</string>
-              </property>
-            </widget>
+           <widget class="QCheckBox" name="minimizeAfterUnlockCheckBox">
+            <property name="text">
+             <string>Minimize window after unlocking database</string>
+            </property>
+           </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="rememberLastDatabasesCheckBox">
@@ -806,7 +806,7 @@
          <item row="1" column="0">
           <widget class="QLabel" name="autoTypeShortcutLabel">
            <property name="text">
-            <string>Global Auto-Type shortcut</string>
+            <string>Global Auto-Type shortcut:</string>
            </property>
           </widget>
          </item>
@@ -826,7 +826,7 @@
          <item row="3" column="0">
           <widget class="QLabel" name="autoTypeDelayLabel">
            <property name="text">
-            <string>Auto-Type typing delay</string>
+            <string>Auto-Type typing delay:</string>
            </property>
           </widget>
          </item>
@@ -858,7 +858,7 @@
          <item row="2" column="0">
           <widget class="QLabel" name="autoTypeStartDelayLabel">
            <property name="text">
-            <string>Auto-Type start delay</string>
+            <string>Auto-Type start delay:</string>
            </property>
           </widget>
          </item>
diff --git a/src/gui/EditWidgetIcons.ui b/src/gui/EditWidgetIcons.ui
index 9648cca08..2d3d44817 100644
--- a/src/gui/EditWidgetIcons.ui
+++ b/src/gui/EditWidgetIcons.ui
@@ -26,7 +26,7 @@
    <item>
     <widget class="QRadioButton" name="defaultIconsRadio">
      <property name="text">
-      <string>&amp;Use default icon</string>
+      <string>Use default icon</string>
      </property>
     </widget>
    </item>
@@ -58,7 +58,7 @@
    <item>
     <widget class="QRadioButton" name="customIconsRadio">
      <property name="text">
-      <string>Use custo&amp;m icon</string>
+      <string>Use custom icon</string>
      </property>
     </widget>
    </item>
@@ -151,7 +151,7 @@
         <string notr="true">padding: 4px 10px</string>
        </property>
        <property name="text">
-        <string>Apply icon &amp;to ...</string>
+        <string>Apply icon to...</string>
        </property>
       </widget>
      </item>
diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
index a30077015..38af84b75 100644
--- a/src/gui/PasswordGeneratorWidget.ui
+++ b/src/gui/PasswordGeneratorWidget.ui
@@ -1091,7 +1091,7 @@ QProgressBar::chunk {
              <item row="1" column="0" alignment="Qt::AlignRight">
               <widget class="QLabel" name="labelWordCount">
                <property name="text">
-                <string>Word Co&amp;unt:</string>
+                <string>Word Count:</string>
                </property>
                <property name="buddy">
                 <cstring>spinBoxLength</cstring>
diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetBrowser.ui b/src/gui/dbsettings/DatabaseSettingsWidgetBrowser.ui
index 463f572d5..34553f97d 100644
--- a/src/gui/dbsettings/DatabaseSettingsWidgetBrowser.ui
+++ b/src/gui/dbsettings/DatabaseSettingsWidgetBrowser.ui
@@ -62,7 +62,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string>&amp;Disconnect all browsers</string>
+           <string>Disconnect all browsers</string>
           </property>
          </widget>
         </item>
@@ -75,7 +75,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string>Forg&amp;et all site-specific settings on entries</string>
+           <string>Forget all site-specific settings on entries</string>
           </property>
          </widget>
         </item>
@@ -92,7 +92,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</string>
+           <string>Move KeePassHTTP attributes to KeePassXC-Browser custom data</string>
           </property>
          </widget>
         </item>
diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.ui b/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.ui
index 02f07952b..29349282b 100644
--- a/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.ui
+++ b/src/gui/dbsettings/DatabaseSettingsWidgetGeneral.ui
@@ -183,7 +183,7 @@
       <item>
        <widget class="QCheckBox" name="compressionCheckbox">
         <property name="text">
-         <string>Enable &amp;compression (recommended)</string>
+         <string>Enable compression (recommended)</string>
         </property>
         <property name="checked">
          <bool>true</bool>
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 27dc8b10e..2880e8ba0 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -1112,8 +1112,8 @@ void EditEntryWidget::cancel()
     bool accepted = false;
     if (isModified()) {
         auto result = MessageBox::question(this,
-                                           QString(),
-                                           tr("Entry has unsaved changes"),
+                                           tr("Unsaved Changes"),
+                                           tr("Would you like to save changes to this entry?"),
                                            MessageBox::Cancel | MessageBox::Save | MessageBox::Discard,
                                            MessageBox::Cancel);
         if (result == MessageBox::Cancel) {
@@ -1260,7 +1260,7 @@ void EditEntryWidget::displayAttribute(QModelIndex index, bool showProtected)
     if (index.isValid()) {
         QString key = m_attributesModel->keyByIndex(index);
         if (showProtected) {
-            m_advancedUi->attributesEdit->setPlainText(tr("[PROTECTED] Press reveal to view or edit"));
+            m_advancedUi->attributesEdit->setPlainText(tr("[PROTECTED] Press Reveal to view or edit"));
             m_advancedUi->attributesEdit->setEnabled(false);
             m_advancedUi->revealAttributeButton->setEnabled(true);
             m_advancedUi->protectAttributeButton->setChecked(true);
diff --git a/src/gui/entry/EditEntryWidgetAutoType.ui b/src/gui/entry/EditEntryWidgetAutoType.ui
index d987e8047..0008a7011 100644
--- a/src/gui/entry/EditEntryWidgetAutoType.ui
+++ b/src/gui/entry/EditEntryWidgetAutoType.ui
@@ -49,14 +49,14 @@
    <item>
     <widget class="QRadioButton" name="inheritSequenceButton">
      <property name="text">
-      <string>Inherit default Auto-Type sequence from the &amp;group</string>
+      <string>Inherit default Auto-Type sequence from the group</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QRadioButton" name="customSequenceButton">
      <property name="text">
-      <string>&amp;Use custom Auto-Type sequence:</string>
+      <string>Use custom Auto-Type sequence:</string>
      </property>
     </widget>
    </item>
diff --git a/src/gui/group/EditGroupWidgetMain.ui b/src/gui/group/EditGroupWidgetMain.ui
index 486e408b6..f23e43f19 100644
--- a/src/gui/group/EditGroupWidgetMain.ui
+++ b/src/gui/group/EditGroupWidgetMain.ui
@@ -117,14 +117,14 @@
    <item row="5" column="1">
     <widget class="QRadioButton" name="autoTypeSequenceInherit">
      <property name="text">
-      <string>&amp;Use default Auto-Type sequence of parent group</string>
+      <string>Use default Auto-Type sequence of parent group</string>
      </property>
     </widget>
    </item>
    <item row="6" column="1">
     <widget class="QRadioButton" name="autoTypeSequenceCustomRadio">
      <property name="text">
-      <string>Set default Auto-Type se&amp;quence</string>
+      <string>Set default Auto-Type sequence</string>
      </property>
     </widget>
    </item>
diff --git a/src/gui/wizard/NewDatabaseWizardPage.ui b/src/gui/wizard/NewDatabaseWizardPage.ui
index 6b69e85b5..e920b26ed 100644
--- a/src/gui/wizard/NewDatabaseWizardPage.ui
+++ b/src/gui/wizard/NewDatabaseWizardPage.ui
@@ -12,7 +12,7 @@
    <string>WizardPage</string>
   </property>
   <property name="title">
-   <string>En&amp;cryption Settings</string>
+   <string>Encryption Settings</string>
   </property>
   <property name="subTitle">
    <string>Here you can adjust the database encryption settings. Don't worry, you can change them later in the database settings.</string>
diff --git a/src/keeshare/group/EditGroupWidgetKeeShare.ui b/src/keeshare/group/EditGroupWidgetKeeShare.ui
index b64195c64..ad3f6dbe4 100644
--- a/src/keeshare/group/EditGroupWidgetKeeShare.ui
+++ b/src/keeshare/group/EditGroupWidgetKeeShare.ui
@@ -64,10 +64,10 @@
        <item>
         <widget class="QToolButton" name="pathSelectionButton">
          <property name="accessibleName">
-          <string>Browser for share file</string>
+          <string>Browse for share file</string>
          </property>
          <property name="text">
-          <string>...</string>
+          <string>Browse...</string>
          </property>
         </widget>
        </item>