summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSilarn <jrim@rimpo.org>2019-05-21 23:46:12 -0500
committerSilarn <jrim@rimpo.org>2019-05-21 23:46:12 -0500
commit1d09e85c089ef71445286faae248f25cd7d239a6 (patch)
tree6657bc73dc49c9064d4b43acc015cf81e6c71b7c /src
parent2a09e17cf4b888bfa38ec73686204427e4b1dea3 (diff)
Add logs to build artifacts on CI fail, commit translation changes
Diffstat (limited to 'src')
-rw-r--r--src/organizer_en.ts70
-rw-r--r--src/version.rc4
2 files changed, 37 insertions, 37 deletions
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>
@@ -5790,6 +5790,37 @@ If the folder was still in use, restart MO and try again.</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>
<translation type="unfinished"></translation>
@@ -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