Merge pull request #1418 from Holt59/master

Bump version to 2.4.0 and update translation.
ModOrganizer2 · Feb 21, 2021 · 7084021 · 7084021
2 parents 3fad475 + 1dd2acf
commit 7084021
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/organizer_en.ts b/src/organizer_en.ts
@@ -5781,48 +5781,48 @@ Continue?</source>
 <context>
     <name>PluginContainer</name>
     <message>
-        <location filename="plugincontainer.cpp" line="1006"/>
+        <location filename="plugincontainer.cpp" line="1016"/>
         <source>Plugin error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="1007"/>
+        <location filename="plugincontainer.cpp" line="1017"/>
         <source>Mod Organizer failed to load the plugin &apos;%1&apos; last time it was started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="1010"/>
+        <location filename="plugincontainer.cpp" line="1020"/>
         <source>The plugin can be skipped for this session, blacklisted, or loaded normally, in which case it might fail again. Blacklisted plugins can be re-enabled later in the settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="1015"/>
+        <location filename="plugincontainer.cpp" line="1025"/>
         <source>Skip this plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="1016"/>
+        <location filename="plugincontainer.cpp" line="1026"/>
         <source>Blacklist this plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="1017"/>
+        <location filename="plugincontainer.cpp" line="1027"/>
         <source>Load this plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="1114"/>
+        <location filename="plugincontainer.cpp" line="1124"/>
         <source>Some plugins could not be loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="1117"/>
-        <location filename="plugincontainer.cpp" line="1135"/>
+        <location filename="plugincontainer.cpp" line="1127"/>
+        <location filename="plugincontainer.cpp" line="1145"/>
         <source>Description missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="1126"/>
+        <location filename="plugincontainer.cpp" line="1136"/>
         <source>The following plugins could not be loaded. The reason may be missing dependencies (i.e. python) or an outdated version:</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/version.rc b/src/version.rc
@@ -4,13 +4,13 @@
 // 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,4,0
-#define VER_FILEVERSION_STR "2.4.0rc3\0"
+#define VER_FILEVERSION_STR "2.4.0\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
 PRODUCTVERSION  VER_FILEVERSION
 FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
-FILEFLAGS       VS_FF_PRERELEASE
+FILEFLAGS       (0)
 FILEOS          VOS__WINDOWS32
 FILETYPE        VFT_APP
 FILESUBTYPE     (0)