prepared for release 1.1

git-svn-id: svn+ssh://svn.code.sf.net/p/webissues/code/trunk/client@2102 c8fa975d-6fd4-4e76-b3b8-1a99b2ee3549
mimecorg · Nov 12, 2013 · 2d393b2 · 2d393b2
1 parent a2e6353
commit 2d393b2
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 15 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+1.1 (2013-11-12)
+    * added Dutch and German translation
+    * fixed sorting by date attribute
+
 1.1-rc1 (2013-10-29)
     * added Czech and Russian translation
     * added global lists of issues

diff --git a/README b/README
@@ -1,5 +1,5 @@
 WebIssues Desktop Client
-Version 1.1-rc1 (2013-10-29)
+Version 1.1 (2013-11-12)
 
 Desktop Client for the WebIssues team collaboration system.
 
@@ -84,6 +84,14 @@ Translators:
  * Flávio Veras (flaviove at gmail com)
     - Portuguese (Brazil) translation
 
+ * Torsten Bielen (torsten.bielen at datex de)
+ * David Keller
+    - German translation
+
+ * Rob Hiddinga (rob at robhiddinga nl)
+ * Steven Heyse (heyse.s at gmail com)
+    - Dutch translation
+
  * René Villegas (renevillegasr at gmail com)
     - Spanish translation
 

diff --git a/packages/win32/build.bat b/packages/win32/build.bat
@@ -2,8 +2,8 @@
 
 if "%1" == "" goto usage
 
-set VERSION=1.1-rc1
-set BUILDVERSION=1.1.0.5051
+set VERSION=1.1
+set BUILDVERSION=1.1.0.5065
 
 set NSISDIR=C:\Program Files (x86)\NSIS\Unicode
 

diff --git a/packages/win32/portable.nsi b/packages/win32/portable.nsi
@@ -176,13 +176,17 @@ Section
     File "${SRCDIR}\translations\locale.ini"
 
     File "${SRCDIR}\translations\webissues_cs.qm"
+    File "${SRCDIR}\translations\webissues_de.qm"
     File "${SRCDIR}\translations\webissues_es.qm"
+    File "${SRCDIR}\translations\webissues_nl.qm"
     File "${SRCDIR}\translations\webissues_pl.qm"
     File "${SRCDIR}\translations\webissues_pt_BR.qm"
     File "${SRCDIR}\translations\webissues_ru.qm"
 
     File "${QTDIR}\translations\qt_cs.qm"
+    File "${QTDIR}\translations\qt_de.qm"
     File "${QTDIR}\translations\qt_es.qm"
+    ;File "${QTDIR}\translations\qt_nl.qm"
     File "${QTDIR}\translations\qt_pl.qm"
     File "${QTDIR}\translations\qt_pt.qm"
     File "${QTDIR}\translations\qt_ru.qm"

diff --git a/packages/win32/portable/appinfo.ini b/packages/win32/portable/appinfo.ini
@@ -16,8 +16,8 @@ Freeware=true
 CommercialUse=true
 
 [Version]
-PackageVersion=1.1.0.5051
-DisplayVersion=1.1-rc1
+PackageVersion=1.1.0.5065
+DisplayVersion=1.1
 
 [Control]
 Icons=1

diff --git a/packages/win32/portable/help.html b/packages/win32/portable/help.html
@@ -14,7 +14,7 @@
             <h1><img src="App/WebIssues/doc/en/common/webissues.png" alt="WebIssues" id="logo" />WebIssues Portable Client</h1> 
           </div> 
           <div id="header-right"> 
-            <h2 class="subtitle">Version 1.1-rc1</h2> 
+            <h2 class="subtitle">Version 1.1</h2> 
           </div> 
         </div> 
         <div id="infobar"> 

diff --git a/packages/win32/webissues.nsi b/packages/win32/webissues.nsi
@@ -163,21 +163,25 @@ Section
     File "${SRCDIR}\translations\locale.ini"
 
     File "${SRCDIR}\translations\webissues_cs.qm"
+    File "${SRCDIR}\translations\webissues_de.qm"
     File "${SRCDIR}\translations\webissues_es.qm"
+    File "${SRCDIR}\translations\webissues_nl.qm"
     File "${SRCDIR}\translations\webissues_pl.qm"
     File "${SRCDIR}\translations\webissues_pt_BR.qm"
     File "${SRCDIR}\translations\webissues_ru.qm"
 
     File "${QTDIR}\translations\qt_cs.qm"
+    File "${QTDIR}\translations\qt_de.qm"
     File "${QTDIR}\translations\qt_es.qm"
+    ;File "${QTDIR}\translations\qt_nl.qm"
     File "${QTDIR}\translations\qt_pl.qm"
     File "${QTDIR}\translations\qt_pt.qm"
     File "${QTDIR}\translations\qt_ru.qm"
 
     SetOutPath "$INSTDIR\bin"
 
-    CreateShortCut "$SMPROGRAMS\WebIssues Desktop Client.lnk" "$INSTDIR\bin\webissues.exe"
-    CreateShortCut "$DESKTOP\WebIssues Desktop Client.lnk" "$INSTDIR\bin\webissues.exe"
+    CreateShortCut "$SMPROGRAMS\WebIssues Desktop Client 1.1.lnk" "$INSTDIR\bin\webissues.exe"
+    CreateShortCut "$DESKTOP\WebIssues Desktop Client 1.1.lnk" "$INSTDIR\bin\webissues.exe"
 
     WriteRegStr SHCTX "${UNINST_KEY}" "DisplayIcon" '"$INSTDIR\bin\webissues.exe"'
     WriteRegStr SHCTX "${UNINST_KEY}" "DisplayName" "WebIssues Desktop Client ${VERSION}${SUFFIX}"
@@ -214,8 +218,8 @@ Section "Uninstall"
 
     DeleteRegKey SHCTX "${UNINST_KEY}"
 
-    Delete "$SMPROGRAMS\WebIssues Desktop Client.lnk"
-    Delete "$DESKTOP\WebIssues Desktop Client.lnk"
+    Delete "$SMPROGRAMS\WebIssues Desktop Client 1.1.lnk"
+    Delete "$DESKTOP\WebIssues Desktop Client 1.1.lnk"
 
     Delete "$INSTDIR\ChangeLog"
     Delete "$INSTDIR\COPYING"

diff --git a/src/application.cpp b/src/application.cpp
@@ -305,7 +305,7 @@ void Application::openDownloads()
 
 QString Application::version() const
 {
-    return QString( "1.1-rc1" );
+    return QString( "1.1" );
 }
 
 QString Application::protocolVersion() const

diff --git a/src/webissues.rc b/src/webissues.rc
@@ -3,8 +3,8 @@
 1 ICON "webissues.ico"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,5051
- PRODUCTVERSION 1,1,0,5051
+ FILEVERSION 1,1,0,5065
+ PRODUCTVERSION 1,1,0,5065
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,11 +21,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "WebIssues Team"
             VALUE "FileDescription", "WebIssues Desktop Client"
-            VALUE "FileVersion", "1.1-rc1"
+            VALUE "FileVersion", "1.1"
             VALUE "LegalCopyright", "Copyright (C) 2007-2013 WebIssues Team"
             VALUE "OriginalFilename", "webissues.exe"
             VALUE "ProductName", "WebIssues Desktop Client"
-            VALUE "ProductVersion", "1.1-rc1"
+            VALUE "ProductVersion", "1.1"
         END
     END
     BLOCK "VarFileInfo"