diff options
| author | Silarn <jrim@rimpo.org> | 2019-12-14 14:12:00 -0600 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2019-12-14 14:12:00 -0600 |
| commit | fde5fa279746c90180223942a44f865859f85cb3 (patch) | |
| tree | 642db0dfe9389d2a0974a7cfac8c842480268882 | |
| parent | a912be4c6b7200a76aa16f7fedd50271e5684320 (diff) | |
Streamline manual install fix, bump RC
| -rw-r--r-- | src/installationmanager.cpp | 4 | ||||
| -rw-r--r-- | src/organizer_en.ts | 20 | ||||
| -rw-r--r-- | src/version.rc | 2 |
3 files changed, 12 insertions, 14 deletions
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp index 72397de7..c3aeec88 100644 --- a/src/installationmanager.cpp +++ b/src/installationmanager.cpp @@ -883,9 +883,7 @@ IPluginInstaller::EInstallResult InstallationManager::install(const QString &fil } return IPluginInstaller::RESULT_SUCCESS; } break; - case IPluginInstaller::RESULT_NOTATTEMPTED: { - continue; - } + case IPluginInstaller::RESULT_NOTATTEMPTED: case IPluginInstaller::RESULT_MANUALREQUESTED: { continue; } diff --git a/src/organizer_en.ts b/src/organizer_en.ts index 00bb771c..271599e4 100644 --- a/src/organizer_en.ts +++ b/src/organizer_en.ts @@ -1576,53 +1576,53 @@ Right now the only case I know of where this needs to be overwritten is for the <translation type="unfinished"></translation> </message> <message> - <location filename="installationmanager.cpp" line="897"/> + <location filename="installationmanager.cpp" line="895"/> <source>None of the available installer plugins were able to handle that archive. This is likely due to a corrupted or incompatible download or unrecognized archive format.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="installationmanager.cpp" line="910"/> + <location filename="installationmanager.cpp" line="908"/> <source>no error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="installationmanager.cpp" line="913"/> + <location filename="installationmanager.cpp" line="911"/> <source>7z.dll not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="installationmanager.cpp" line="916"/> + <location filename="installationmanager.cpp" line="914"/> <source>7z.dll isn't valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="installationmanager.cpp" line="919"/> + <location filename="installationmanager.cpp" line="917"/> <source>archive not found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="installationmanager.cpp" line="922"/> + <location filename="installationmanager.cpp" line="920"/> <source>failed to open archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="installationmanager.cpp" line="925"/> + <location filename="installationmanager.cpp" line="923"/> <source>unsupported archive type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="installationmanager.cpp" line="928"/> + <location filename="installationmanager.cpp" line="926"/> <source>internal library error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="installationmanager.cpp" line="931"/> + <location filename="installationmanager.cpp" line="929"/> <source>archive invalid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="installationmanager.cpp" line="935"/> + <location filename="installationmanager.cpp" line="933"/> <source>unknown archive error</source> <translation type="unfinished"></translation> </message> diff --git a/src/version.rc b/src/version.rc index 4220f50f..913d1ead 100644 --- a/src/version.rc +++ b/src/version.rc @@ -4,7 +4,7 @@ // Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser // Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha #define VER_FILEVERSION 2,2,2 -#define VER_FILEVERSION_STR "2.2.2rc3\0" +#define VER_FILEVERSION_STR "2.2.2rc4\0" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION |
