Fix translations

brian8181 · Mar 20, 2022 · 60f7744 · 60f7744
1 parent 1ca358f
commit 60f7744
Show file tree

Hide file tree

Showing 11 changed files with 2,690 additions and 2,734 deletions.
diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
diff --git a/src/browser/BrowserSettingsWidget.ui b/src/browser/BrowserSettingsWidget.ui
@@ -515,7 +515,7 @@
                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
               </property>
               <property name="placeholderText">
-               <string>~/.config/Mozilla/native-messaging-hosts/</string>
+               <string notr="true">~/.config/mozilla/native-messaging-hosts/</string>
               </property>
              </widget>
             </item>

diff --git a/src/cli/Analyze.cpp b/src/cli/Analyze.cpp
@@ -93,7 +93,7 @@ int Analyze::executeWithDatabase(QSharedPointer<Database> database, QSharedPoint
         if (count > 0) {
             out << QObject::tr("Password for '%1' has been leaked %2 time(s)!", "", count).arg(path).arg(count) << endl;
         } else {
-            out << QObject::tr("Password for '%1' has been leaked!", "", count).arg(path) << endl;
+            out << QObject::tr("Password for '%1' has been leaked!").arg(path) << endl;
         }
     }
 

diff --git a/src/core/EntryAttachments.cpp b/src/core/EntryAttachments.cpp
@@ -231,7 +231,7 @@ bool EntryAttachments::openAttachment(const QString& key, QString* errorMessage)
                             && tmpFile.write(attachmentData) == attachmentData.size() && tmpFile.flush();
 
         if (!saveOk && errorMessage) {
-            *errorMessage = tr("%1 - %2").arg(key, tmpFile.errorString());
+            *errorMessage = QString("%1 - %2").arg(key, tmpFile.errorString());
             return false;
         }
 

diff --git a/src/gui/ApplicationSettingsWidgetGeneral.ui b/src/gui/ApplicationSettingsWidgetGeneral.ui
@@ -58,8 +58,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>664</width>
-            <height>1215</height>
+            <width>564</width>
+            <height>930</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_8">
@@ -267,13 +267,13 @@
                    <string>On database unlock, show entries that </string>
                   </property>
                   <property name="specialValueText">
-                   <string>are expired</string>
+                   <string comment="On database unlock, show entries that...">have expired</string>
                   </property>
                   <property name="suffix">
-                   <string> days</string>
+                   <string comment="On database unlock, show entries that will expire within %1 days"> days</string>
                   </property>
                   <property name="prefix">
-                   <string>will expire within </string>
+                   <string comment="On database unlock, show entries that...">will expire within </string>
                   </property>
                   <property name="minimum">
                    <number>0</number>
@@ -1182,7 +1182,7 @@
          <item row="1" column="1">
           <widget class="QSpinBox" name="autoTypeRetypeTimeSpinBox">
            <property name="suffix">
-            <string> s</string>
+            <string comment="Seconds"> sec</string>
            </property>
            <property name="minimum">
             <number>0</number>

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
@@ -1138,9 +1138,10 @@ void DatabaseWidget::loadDatabase(bool accepted)
             if (!expiredEntries.isEmpty()) {
                 m_entryView->displaySearch(expiredEntries);
                 m_entryView->setFirstEntryActive();
-                m_searchingLabel->setText(expirationOffset == 0
-                                              ? tr("Expired entries")
-                                              : tr("Entries expiring within %1 days").arg(expirationOffset));
+                m_searchingLabel->setText(
+                    expirationOffset == 0
+                        ? tr("Expired entries")
+                        : tr("Entries expiring within %1 day(s)", "", expirationOffset).arg(expirationOffset));
                 m_searchingLabel->setVisible(true);
             }
         }

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -817,6 +817,7 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
             m_ui->actionEntryRestore->setVisible(entriesSelected && recycleBinSelected);
             m_ui->actionEntryRestore->setEnabled(entriesSelected && recycleBinSelected);
             m_ui->actionEntryRestore->setText(tr("Restore Entry(s)", "", dbWidget->numberOfSelectedEntries()));
+            m_ui->actionEntryRestore->setToolTip(tr("Restore Entry(s)", "", dbWidget->numberOfSelectedEntries()));
             m_ui->actionEntryMoveUp->setVisible(!sorted);
             m_ui->actionEntryMoveDown->setVisible(!sorted);
             m_ui->actionEntryMoveUp->setEnabled(singleEntrySelected && !sorted && entryIndex > 0);

diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
@@ -216,7 +216,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
    <property name="contextMenuPolicy">
@@ -1072,10 +1072,10 @@
   </action>
   <action name="actionEntryRestore">
    <property name="text">
-    <string>Restore Entry(s)</string>
+    <string notr="true" extracomment="Translatable string with plural form set in CPP file">Restore Entry(s)</string>
    </property>
    <property name="toolTip">
-    <string>Restore Entry(s)</string>
+    <string notr="true" extracomment="Translatable string with plural form set in CPP file">Restore Entry(s)</string>
    </property>
    <property name="shortcut">
     <string notr="true">Ctrl+R</string>

diff --git a/src/gui/TotpDialog.ui b/src/gui/TotpDialog.ui
@@ -22,7 +22,7 @@
       </font>
      </property>
      <property name="text">
-      <string>000000</string>
+      <string notr="true">000000</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>

diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.ui b/src/gui/dbsettings/DatabaseSettingsWidgetEncryption.ui
@@ -58,7 +58,7 @@
          <item>
           <widget class="QLabel" name="decryptionTimeValueLabel">
            <property name="text">
-            <string>?? s</string>
+            <string notr="true">?? s</string>
            </property>
           </widget>
          </item>
@@ -120,7 +120,7 @@
             <item>
              <widget class="QLabel" name="minTimeLabel">
               <property name="text">
-               <string>?? ms</string>
+               <string notr="true">?? ms</string>
               </property>
              </widget>
             </item>
@@ -140,7 +140,7 @@
             <item>
              <widget class="QLabel" name="maxTimeLabel">
               <property name="text">
-               <string>? s</string>
+               <string notr="true">? s</string>
               </property>
              </widget>
             </item>

diff --git a/src/gui/entry/EditEntryWidgetAutoType.ui b/src/gui/entry/EditEntryWidgetAutoType.ui
@@ -188,7 +188,7 @@
              <string>Add new window association</string>
             </property>
             <property name="text">
-             <string>+</string>
+             <string comment="Add item">+</string>
             </property>
            </widget>
           </item>
@@ -216,7 +216,7 @@
              <string>Remove selected window association</string>
             </property>
             <property name="text">
-             <string>-</string>
+             <string comment="Remove item">-</string>
             </property>
            </widget>
           </item>