From 1d09e85c089ef71445286faae248f25cd7d239a6 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Tue, 21 May 2019 23:46:12 -0500
Subject: Add logs to build artifacts on CI fail, commit translation changes

---
 src/organizer_en.ts | 70 ++++++++++++++++++++++++++---------------------------
 src/version.rc      |  4 +--
 2 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'src')

diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index a3761957..f38044de 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -3952,13 +3952,13 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.cpp" line="1894"/>
-        <source>Un-Hide</source>
+        <location filename="modinfodialog.cpp" line="1888"/>
+        <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.cpp" line="1888"/>
-        <source>Hide</source>
+        <location filename="modinfodialog.cpp" line="1894"/>
+        <source>Un-Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5789,6 +5789,37 @@ If the folder was still in use, restart MO and try again.</source>
         <source>failed to parse profile %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="modinfodialog.cpp" line="176"/>
+        <source>The hidden file &quot;%1&quot; already exists. Replace it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialog.cpp" line="179"/>
+        <source>The visible file &quot;%1&quot; already exists. Replace it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialog.cpp" line="189"/>
+        <source>Replace file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialog.cpp" line="228"/>
+        <location filename="modinfodialog.cpp" line="252"/>
+        <source>File operation failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialog.cpp" line="229"/>
+        <source>Failed to remove &quot;%1&quot;. Maybe you lack the required file permissions?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialog.cpp" line="253"/>
+        <source>failed to rename %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="organizercore.cpp" line="171"/>
         <source>Failed to start &quot;%1&quot;</source>
@@ -5872,37 +5903,6 @@ You will be asked if you want to allow helper.exe to make changes to the system.
         <source>failed to spawn &quot;%1&quot;: %2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="modinfodialog.cpp" line="176"/>
-        <source>The hidden file &quot;%1&quot; already exists. Replace it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="modinfodialog.cpp" line="179"/>
-        <source>The visible file &quot;%1&quot; already exists. Replace it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="modinfodialog.cpp" line="189"/>
-        <source>Replace file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="modinfodialog.cpp" line="228"/>
-        <location filename="modinfodialog.cpp" line="252"/>
-        <source>File operation failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="modinfodialog.cpp" line="229"/>
-        <source>Failed to remove &quot;%1&quot;. Maybe you lack the required file permissions?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="modinfodialog.cpp" line="253"/>
-        <source>failed to rename %1 to %2</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QueryOverwriteDialog</name>
diff --git a/src/version.rc b/src/version.rc
index 241cd0ce..af6fd603 100644
--- a/src/version.rc
+++ b/src/version.rc
@@ -3,8 +3,8 @@
 // If VS_FF_PRERELEASE is not set, MO labels the build as a release and uses VER_FILEVERSION to determine version number.
 // 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,0
-#define VER_FILEVERSION_STR "2.2.0\0"
+#define VER_FILEVERSION     2,2,1
+#define VER_FILEVERSION_STR "2.2.1alpha1\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION
-- 
cgit v1.3.1