Update translations

* Corrected use of QCoreApplication::translate -> QObject::tr
* Corrected plural usage in EntryAttachmentsWidget.cpp

src/cli/Remove.cpp

@@ -47,11 +47,11 @@ int Remove::execute(const QStringList& arguments)
     TextStream errorTextStream(Utils::STDERR, QIODevice::WriteOnly);
 
     QCommandLineParser parser;
-    parser.setApplicationDescription(QCoreApplication::tr("main", "Remove an entry from the database."));
-    parser.addPositionalArgument("database", QCoreApplication::tr("main", "Path of the database."));
+    parser.setApplicationDescription(QObject::tr("Remove an entry from the database."));
+    parser.addPositionalArgument("database", QObject::tr("Path of the database."));
     parser.addOption(Command::QuietOption);
     parser.addOption(Command::KeyFileOption);
-    parser.addPositionalArgument("entry", QCoreApplication::tr("main", "Path of the entry to remove."));
+    parser.addPositionalArgument("entry", QObject::tr("Path of the entry to remove."));
     parser.addHelpOption();
     parser.process(arguments);
 

src/gui/Application.cpp

@@ -111,8 +111,7 @@ Application::Application(int& argc, char** argv)
 
             if (!m_alreadyRunning) {
                 // If we get here then the original instance is likely dead
-                qWarning() << QCoreApplication::translate(
-                                  "Main", "Existing single-instance lock file is invalid. Launching new instance.")
+                qWarning() << QObject::tr("Existing single-instance lock file is invalid. Launching new instance.")
                                   .toUtf8()
                                   .constData();
 
@@ -126,8 +125,7 @@ Application::Application(int& argc, char** argv)
         break;
     }
     default:
-        qWarning() << QCoreApplication::translate("Main",
-                                                  "The lock file could not be created. Single-instance mode disabled.")
+        qWarning() << QObject::tr("The lock file could not be created. Single-instance mode disabled.")
                           .toUtf8()
                           .constData();
     }

src/gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp

@@ -127,7 +127,7 @@ void DatabaseSettingsWidgetEncryption::setupAlgorithmComboBox()
 {
     m_ui->algorithmComboBox->clear();
     for (auto& cipher : asConst(KeePass2::CIPHERS)) {
-        m_ui->algorithmComboBox->addItem(QCoreApplication::translate("KeePass2", cipher.second.toUtf8()),
+        m_ui->algorithmComboBox->addItem(cipher.second.toUtf8(),
                                          cipher.first.toByteArray());
     }
     int cipherIndex = m_ui->algorithmComboBox->findData(m_db->cipher().toByteArray());
@@ -142,7 +142,7 @@ void DatabaseSettingsWidgetEncryption::setupKdfComboBox()
     bool block = m_ui->kdfComboBox->blockSignals(true);
     m_ui->kdfComboBox->clear();
     for (auto& kdf : asConst(KeePass2::KDFS)) {
-        m_ui->kdfComboBox->addItem(QCoreApplication::translate("KeePass2", kdf.second.toUtf8()),
+        m_ui->kdfComboBox->addItem(kdf.second.toUtf8(),
                                    kdf.first.toByteArray());
     }
     m_ui->kdfComboBox->blockSignals(block);

src/gui/entry/EntryAttachmentsWidget.cpp

@@ -312,7 +312,7 @@ bool EntryAttachmentsWidget::insertAttachments(const QStringList& filenames, QSt
     }
 
     if (!errors.isEmpty()) {
-        errorMessage = tr("Unable to open files:\n%1").arg(errors.join('\n'));
+        errorMessage = tr("Unable to open file(s):\n%1", "", errors.size()).arg(errors.join('\n'));
     }
 
     return errors.isEmpty();

src/main.cpp

@@ -68,22 +68,22 @@ int main(int argc, char** argv)
 
     QCommandLineParser parser;
     parser.setApplicationDescription(
-        QCoreApplication::translate("main", "KeePassXC - cross-platform password manager"));
+        QObject::tr("KeePassXC - cross-platform password manager"));
     parser.addPositionalArgument(
         "filename",
-        QCoreApplication::translate("main", "filenames of the password databases to open (*.kdbx)"),
+        QObject::tr("filenames of the password databases to open (*.kdbx)"),
         "[filename(s)]");
 
     QCommandLineOption configOption(
-        "config", QCoreApplication::translate("main", "path to a custom config file"), "config");
+        "config", QObject::tr("path to a custom config file"), "config");
     QCommandLineOption keyfileOption(
-        "keyfile", QCoreApplication::translate("main", "key file of the database"), "keyfile");
+        "keyfile", QObject::tr("key file of the database"), "keyfile");
     QCommandLineOption pwstdinOption("pw-stdin",
-                                     QCoreApplication::translate("main", "read password of the database from stdin"));
+                                     QObject::tr("read password of the database from stdin"));
     // This is needed under Windows where clients send --parent-window parameter with Native Messaging connect method
     QCommandLineOption parentWindowOption(QStringList() << "pw"
                                                         << "parent-window",
-                                          QCoreApplication::translate("main", "Parent window handle"),
+                                          QObject::tr("Parent window handle"),
                                           "handle");
 
     QCommandLineOption helpOption = parser.addHelpOption();
@@ -106,7 +106,7 @@ int main(int argc, char** argv)
         if (!fileNames.isEmpty()) {
             app.sendFileNamesToRunningInstance(fileNames);
         }
-        qWarning() << QCoreApplication::translate("Main", "Another instance of KeePassXC is already running.")
+        qWarning() << QObject::tr("Another instance of KeePassXC is already running.")
                           .toUtf8()
                           .constData();
         return 0;
@@ -115,10 +115,10 @@ int main(int argc, char** argv)
     QApplication::setQuitOnLastWindowClosed(false);
 
     if (!Crypto::init()) {
-        QString error = QCoreApplication::translate("Main", "Fatal error while testing the cryptographic functions.");
+        QString error = QObject::tr("Fatal error while testing the cryptographic functions.");
         error.append("\n");
         error.append(Crypto::errorString());
-        MessageBox::critical(nullptr, QCoreApplication::translate("Main", "KeePassXC - Error"), error);
+        MessageBox::critical(nullptr, QObject::tr("KeePassXC - Error"), error);
         return 1;
     }
 
@@ -142,7 +142,7 @@ int main(int argc, char** argv)
             // buffer for native messaging, even if the specified file does not exist
             static QTextStream in(stdin, QIODevice::ReadOnly);
             static QTextStream out(stdout, QIODevice::WriteOnly);
-            out << QCoreApplication::translate("Main", "Database password: ") << flush;
+            out << QObject::tr("Database password: ") << flush;
             password = Utils::getPassword();
         }