PUBLISH (4.1.0)

cyanfish · Aug 6, 2015 · bcd4cc3 · bcd4cc3
1 parent 8920253
commit bcd4cc3
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 48 deletions.
diff --git a/NAPS2.Console/Properties/AssemblyInfo.cs b/NAPS2.Console/Properties/AssemblyInfo.cs
@@ -48,5 +48,5 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("4.0.3.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/NAPS2.Core/Properties/AssemblyInfo.cs b/NAPS2.Core/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("4.0.3.*")]
-[assembly: AssemblyVersion("4.0.3.*")]
+// [assembly: AssemblyVersion("4.1.0.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/NAPS2.Core/WinForms/FAbout.he.resx b/NAPS2.Core/WinForms/FAbout.he.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.hr.resx b/NAPS2.Core/WinForms/FAbout.hr.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.hu.resx b/NAPS2.Core/WinForms/FAbout.hu.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.it.resx b/NAPS2.Core/WinForms/FAbout.it.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.nl.resx b/NAPS2.Core/WinForms/FAbout.nl.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.pl.resx b/NAPS2.Core/WinForms/FAbout.pl.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.pt-BR.resx b/NAPS2.Core/WinForms/FAbout.pt-BR.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.pt-PT.resx b/NAPS2.Core/WinForms/FAbout.pt-PT.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.ru.resx b/NAPS2.Core/WinForms/FAbout.ru.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.sq.resx b/NAPS2.Core/WinForms/FAbout.sq.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.sv.resx b/NAPS2.Core/WinForms/FAbout.sv.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.tr.resx b/NAPS2.Core/WinForms/FAbout.tr.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.uk.resx b/NAPS2.Core/WinForms/FAbout.uk.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Core/WinForms/FAbout.zh-TW.resx b/NAPS2.Core/WinForms/FAbout.zh-TW.resx
@@ -437,13 +437,13 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>150, 42</value>
     </data>
     <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
-        <value>193, 13</value>
+        <value>117, 13</value>
     </data>
     <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
         <value>30</value>
     </data>
     <data name="linkLabel1.Text" xml:space="preserve">
-        <value>http://sourceforge.com/projects/naps2</value>
+        <value>http://www.naps2.com</value>
     </data>
     <data name="&gt;&gt;linkLabel1.Name" xml:space="preserve">
         <value>linkLabel1</value>
@@ -556,6 +556,6 @@ Copyright © 2012-2015 Ben Olden-Cooligan</value>
         <value>FAbout</value>
     </data>
     <data name="&gt;&gt;$this.Type" xml:space="preserve">
-        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.0.1.24136, Culture=neutral, PublicKeyToken=null</value>
+        <value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=4.1.0.42816, Culture=neutral, PublicKeyToken=null</value>
     </data>
 </root>
diff --git a/NAPS2.Setup/NAPS2.Setup.wxs b/NAPS2.Setup/NAPS2.Setup.wxs
@@ -4,7 +4,7 @@
       Id="*"
       Name="NAPS2"
       Language="1033"
-      Version="4.0.3"
+      Version="4.1.0"
       Manufacturer="Ben Olden-Cooligan"
       UpgradeCode="FEB82971-B3E6-4F19-9684-1D543E644D73">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />

diff --git a/NAPS2/Properties/AssemblyInfo.cs b/NAPS2/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("4.0.3.*")]
+[assembly: AssemblyVersion("4.1.0.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/NAPS2/Setup/setup.iss b/NAPS2/Setup/setup.iss
@@ -1,7 +1,7 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define AppVersion "4.0.3"
+#define AppVersion "4.1.0"
 
 [Setup]
 AppName=NAPS2 (Not Another PDF Scanner 2)