Merge pull request #842 from keepassxreboot/extract_tr_messages

Normalizing translated messages in Extract.
This commit is contained in:
Janek Bevendorff 2017-08-01 23:47:09 +02:00 committed by GitHub
commit ca2e448684

View File

@ -62,7 +62,7 @@ int Extract::execute(QStringList arguments)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
out << "Insert the database password\n> "; out << QObject::tr("Insert password to unlock %1: ").arg(args.at(0));
out.flush(); out.flush();
CompositeKey compositeKey; CompositeKey compositeKey;
@ -77,7 +77,7 @@ int Extract::execute(QStringList arguments)
FileKey fileKey; FileKey fileKey;
QString errorMsg; QString errorMsg;
if (!fileKey.load(keyFilePath, &errorMsg)) { if (!fileKey.load(keyFilePath, &errorMsg)) {
errorTextStream << QObject::tr("Failed to load key file %s: %s").arg(keyFilePath).arg(errorMsg); errorTextStream << QObject::tr("Failed to load key file %1 : %2").arg(keyFilePath).arg(errorMsg);
errorTextStream << endl; errorTextStream << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }