Updated translation file and fixed typos

aerowolf · Oct 24, 2019 · 34bbf8b · 34bbf8b
1 parent af263fd
commit 34bbf8b
Show file tree

Hide file tree

Showing 11 changed files with 1,794 additions and 334 deletions.
diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassx_en.ts
diff --git a/src/cli/Analyze.cpp b/src/cli/Analyze.cpp
@@ -78,5 +78,5 @@ void Analyze::printHibpFinding(const Entry* entry, int count, QTextStream& out)
         path.prepend("/").prepend(g->name());
     }
 
-    out << QObject::tr("Password for '%1' has been leaked %2 times!").arg(path).arg(count) << endl;
+    out << QObject::tr("Password for '%1' has been leaked %2 time(s)!", "", count).arg(path).arg(count) << endl;
 }
diff --git a/src/cli/Export.cpp b/src/cli/Export.cpp
@@ -29,11 +29,11 @@ const QCommandLineOption Export::FormatOption =
     QCommandLineOption(QStringList() << "f"
                                      << "format",
                        QObject::tr("Format to use when exporting. Available choices are xml or csv. Defaults to xml."),
-                       QObject::tr("xml|csv"));
+                       QStringLiteral("xml|csv"));
 
 Export::Export()
 {
-    name = QString("export");
+    name = QStringLiteral("export");
     options.append(Export::FormatOption);
     description = QObject::tr("Exports the content of a database to standard output in the specified format.");
 }
@@ -44,15 +44,15 @@ int Export::executeWithDatabase(QSharedPointer<Database> database, QSharedPointe
     TextStream errorTextStream(Utils::STDERR, QIODevice::WriteOnly);
 
     QString format = parser->value(Export::FormatOption);
-    if (format.isEmpty() || format == QString("xml")) {
+    if (format.isEmpty() || format == QStringLiteral("xml")) {
         QByteArray xmlData;
         QString errorMessage;
         if (!database->extract(xmlData, &errorMessage)) {
             errorTextStream << QObject::tr("Unable to export database to XML: %1").arg(errorMessage) << endl;
             return EXIT_FAILURE;
         }
         outputTextStream << xmlData.constData() << endl;
-    } else if (format == QString("csv")) {
+    } else if (format == QStringLiteral("csv")) {
         CsvExporter csvExporter;
         outputTextStream << csvExporter.exportDatabase(database);
     } else {

diff --git a/src/cli/Generate.cpp b/src/cli/Generate.cpp
@@ -126,7 +126,7 @@ QSharedPointer<PasswordGenerator> Generate::createGenerator(QSharedPointer<QComm
     passwordGenerator->setExcludedChars(parser->value(Generate::ExcludeCharsOption));
 
     if (!passwordGenerator->isValid()) {
-        errorTextStream << QObject::tr("invalid password generator after applying all options") << endl;
+        errorTextStream << QObject::tr("Invalid password generator after applying all options") << endl;
         return QSharedPointer<PasswordGenerator>(nullptr);
     }
 

diff --git a/src/gui/DatabaseOpenWidget.ui b/src/gui/DatabaseOpenWidget.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="accessibleName">
-   <string>Unlock KePassXC Database</string>
+   <string>Unlock KeePassXC Database</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0,2">
    <item>
@@ -86,7 +86,7 @@
         <item>
          <widget class="ElidedLabel" name="fileNameLabel">
           <property name="text">
-           <string>filename.kdbx</string>
+           <string notr="true">filename.kdbx</string>
           </property>
          </widget>
         </item>
@@ -380,7 +380,7 @@
                            }</string>
                       </property>
                       <property name="text">
-                       <string>?</string>
+                       <string notr="true">?</string>
                       </property>
                       <property name="iconSize">
                        <size>

diff --git a/src/gui/EntryPreviewWidget.ui b/src/gui/EntryPreviewWidget.ui
@@ -100,7 +100,7 @@
             </font>
            </property>
            <property name="text">
-            <string>1234567</string>
+            <string notr="true">1234567</string>
            </property>
           </widget>
          </item>

diff --git a/src/gui/IconDownloaderDialog.ui b/src/gui/IconDownloaderDialog.ui
@@ -29,7 +29,7 @@
       </font>
      </property>
      <property name="text">
-      <string>Downloading favicon 0/0...</string>
+      <string notr="true">Downloading favicon 0/0...</string>
      </property>
     </widget>
    </item>

diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
@@ -765,7 +765,7 @@
     <string>&amp;Keyboard Shortcuts</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+/</string>
+    <string notr="true">Ctrl+/</string>
    </property>
   </action>
  </widget>

diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
@@ -171,7 +171,7 @@ QProgressBar::chunk {
      <item row="0" column="2">
       <widget class="QToolButton" name="togglePasswordButton">
        <property name="accessibleName">
-        <string>Toggle password visibiity</string>
+        <string>Toggle password visibility</string>
        </property>
        <property name="accessibleDescription">
         <string/>

diff --git a/src/gui/csvImport/CsvImportWidget.ui b/src/gui/csvImport/CsvImportWidget.ui
@@ -232,7 +232,7 @@
          </font>
         </property>
         <property name="accessibleName">
-         <string>Field seperation</string>
+         <string>Field separation</string>
         </property>
         <property name="editable">
          <bool>false</bool>

diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui
@@ -129,7 +129,7 @@
    <item row="9" column="0" alignment="Qt::AlignLeft|Qt::AlignTop">
     <widget class="QCheckBox" name="notesEnabled">
      <property name="toolTip">
-      <string>Toggle notes visibile</string>
+      <string>Toggle notes visible</string>
      </property>
      <property name="accessibleName">
       <string>Toggle notes visible</string>