Merge branch 'release/1.3.1'

redwarp · Jul 5, 2013 · 0717ca2 · 0717ca2
2 parents 7e287bc + a1f2b0d
commit 0717ca2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/launch4j_config.xml b/launch4j_config.xml
@@ -1,8 +1,8 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.2.jar</jar>
-  <outfile>C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.2.exe</outfile>
+  <jar>C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.3.1.jar</jar>
+  <outfile>C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.3.1.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir></chdir>
@@ -24,12 +24,12 @@
     <jdkPreference>preferJre</jdkPreference>
   </jre>
   <versionInfo>
-    <fileVersion>1.2.0.0</fileVersion>
-    <txtFileVersion>1.2</txtFileVersion>
+    <fileVersion>1.3.1.0</fileVersion>
+    <txtFileVersion>1.3.1</txtFileVersion>
     <fileDescription>9Patch Resizer</fileDescription>
-    <copyright>Redwarp - 2012</copyright>
-    <productVersion>1.2.0.0</productVersion>
-    <txtProductVersion>1.2</txtProductVersion>
+    <copyright>Redwarp - 2013</copyright>
+    <productVersion>1.3.1.0</productVersion>
+    <txtProductVersion>1.3.1</txtProductVersion>
     <productName>9Patch Resizer</productName>
     <companyName></companyName>
     <internalName>Resizer</internalName>

diff --git a/res/locale/Strings.properties b/res/locale/Strings.properties
@@ -16,5 +16,5 @@ status_finished=Finished \!
 status_in_progress=In progress...
 status_pending=Pending...
 xhdpi=Drop xhdpi image here (PNG format, nine patch included)
-input_density="Input density:"
-output_density="Output density:"
+input_density=Input density:
+output_density=Output density:
diff --git a/res/locale/Strings_fr.properties b/res/locale/Strings_fr.properties
@@ -16,5 +16,5 @@ status_finished=Termin\u00E9 \!
 status_in_progress=En cours...
 status_pending=En attente...
 xhdpi=D\u00E9posez des images au format PNG (9 patch inclus)
-input_density="Densit\u00E9 d'entr\u00E9e :"
-output_density="Densit\u00E9s de sortie :"
+input_density=Densit\u00E9 d'entr\u00E9e :
+output_density=Densit\u00E9s de sortie :
diff --git a/res/misc/preferences.properties b/res/misc/preferences.properties
@@ -1,3 +1,3 @@
 #Created by JInto - www.guh-software.de
 #Sun Oct 21 22:30:52 CEST 2012
-version=1.3
+version=1.3.1