diff --git a/launcher/innoextract.cpp b/launcher/innoextract.cpp index f20ae641e..1380f078d 100644 --- a/launcher/innoextract.cpp +++ b/launcher/innoextract.cpp @@ -127,17 +127,17 @@ QString Innoextract::getHashError(QString exeFile, QString binFile, QString exeF exeInfoOriginal = doHash(QFile(exeFileOriginal)); if(!binFileOriginal.isEmpty()) binInfoOriginal = doHash(QFile(binFileOriginal)); - + if(exeInfo.hash.empty() || (!binFile.isEmpty() && binInfo.hash.empty())) return QString{}; // hashing not possible -> previous error is enough - QString hashOutput = tr("SHA1 hash of provided files:\nExe (%1 bytes):\n%2").arg(QString::number(exeInfo.size), QString::fromStdString(exeInfo.hash)); + QString hashOutput = tr("SHA1 hash of provided files:\nExe (%n bytes):\n%1", "param is hash", exeInfo.size).arg(QString::fromStdString(exeInfo.hash)); if(!binInfo.hash.empty()) - hashOutput += tr("\nBin (%1 bytes):\n%2").arg(QString::number(binInfo.size), QString::fromStdString(binInfo.hash)); - + hashOutput += tr("\nBin (%n bytes):\n%1", "param is hash", binInfo.size).arg(QString::fromStdString(binInfo.hash)); + if((!exeInfoOriginal.hash.empty() && exeInfo.hash != exeInfoOriginal.hash) || (!binInfoOriginal.hash.empty() && !binFile.isEmpty() && !binFileOriginal.isEmpty() && binInfo.hash != binInfoOriginal.hash)) return tr("Internal copy process failed. Enough space on device?\n\n%1").arg(hashOutput); - + QString foundKnown; QString exeLang; QString binLang; diff --git a/launcher/modManager/modstatecontroller.cpp b/launcher/modManager/modstatecontroller.cpp index 31132706d..53da0e3fb 100644 --- a/launcher/modManager/modstatecontroller.cpp +++ b/launcher/modManager/modstatecontroller.cpp @@ -245,7 +245,7 @@ bool ModStateController::doUninstallMod(QString modname) QString modDir = pathToQString(*CResourceHandler::get()->getResourceName(resID)); if(!QDir(modDir).exists()) - return addError(modname, tr("Data with this mod was not found")); + return addError(modname, tr("Mod data was not found")); QDir modFullDir(modDir); if(!removeModDir(modDir)) diff --git a/launcher/settingsView/csettingsview_moc.ui b/launcher/settingsView/csettingsview_moc.ui index 678358af5..69be97744 100644 --- a/launcher/settingsView/csettingsview_moc.ui +++ b/launcher/settingsView/csettingsview_moc.ui @@ -458,7 +458,7 @@ - % + % 50