1.8.3-rc1

Since our DLLs version number aren't bumped, a same file size could
cause a DLL not to be installed to replace an old one.
This eventually can cause a crash of explorer if an incompatible version
of OCUtil.dll is installed alone.

Fix the issue by defining LIBRARY_IGNORE_VERSION. This also makes sure
that installing an old version of the client over a more recent one
if we decide to add version numbers to those DLLs.

ChangeLog

@@ -1,3 +1,9 @@
+ChangeLog
+=========
+version 1.8.3 (release 2015-06-??)
+  * Fix a bug in the Windows Installer that could crash explorer (#3320)
+  * Reduce 'Connection closed' errors (#3318, #3313, #3298)
+
 ChangeLog
 =========
 version 1.8.2 (release 2015-06-08)

VERSION.cmake

@@ -1,10 +1,10 @@
 set( MIRALL_VERSION_MAJOR 1 )
 set( MIRALL_VERSION_MINOR 8 )
-set( MIRALL_VERSION_PATCH 2 )
+set( MIRALL_VERSION_PATCH 3 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "rc1") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

cmake/modules/NSIS.template.in

@@ -479,6 +479,7 @@ SectionEnd
       CreateDirectory "$INSTDIR\shellext"
       !define LIBRARY_COM
       !define LIBRARY_SHELL_EXTENSION
+      !define LIBRARY_IGNORE_VERSION
       ${If} ${RunningX64}
          !define LIBRARY_X64
          !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "${SOURCE_PATH}\binary\shell_integration\windows\Release\x64\OCUtil_x64.dll" "$INSTDIR\shellext\OCUtil_x64.dll" "$INSTDIR\shellext"
@@ -492,6 +493,7 @@ SectionEnd
       ${Endif}
       !undef LIBRARY_COM
       !undef LIBRARY_SHELL_EXTENSION
+      !undef LIBRARY_IGNORE_VERSION
    ${MementoSectionEnd}
 !endif
 
@@ -650,6 +652,7 @@ Section Uninstall
    !ifdef OPTION_SECTION_SC_SHELL_EXT
       !define LIBRARY_COM
       !define LIBRARY_SHELL_EXTENSION
+      !define LIBRARY_IGNORE_VERSION
       ${If} ${HasSection} SEC_SHELL_EXT
         DetailPrint "Uninstalling x64 overlay DLLs"
         !define LIBRARY_X64
@@ -665,6 +668,7 @@ Section Uninstall
       ${EndIf}
       !undef LIBRARY_COM
       !undef LIBRARY_SHELL_EXTENSION
+      !undef LIBRARY_IGNORE_VERSION
   !endif
 
    ;Start menu shortcut

doc/building.rst

@@ -214,6 +214,8 @@ To build the most up to date version of the client:
 1. Clone the latest versions of the client from Git_ as follows:
 
   ``git clone git://github.com/owncloud/client.git``
+  ``git submodule init``
+  ``git submodule update``
 
 2. Create the build directory:
 

translations/client_et.ts

@@ -702,12 +702,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
     <message>
         <location filename="../src/gui/folderwizard.cpp" line="46"/>
         <source>&lt;b&gt;Warning:&lt;/b&gt; %1</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;Hoiatus:&lt;/b&gt; %1</translation>
     </message>
     <message>
         <location filename="../src/gui/folderwizard.cpp" line="48"/>
         <source>&lt;b&gt;Warning:&lt;/b&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;Hoiatus:&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
@@ -1862,7 +1862,7 @@ Selle kasutamine pole soovitatav.</translation>
     <message>
         <location filename="../src/gui/sharedialog.ui" line="142"/>
         <source>Set password</source>
-        <translation type="unfinished"/>
+        <translation>Määra parool</translation>
     </message>
     <message>
         <location filename="../src/gui/sharedialog.cpp" line="634"/>
@@ -1892,7 +1892,7 @@ Selle kasutamine pole soovitatav.</translation>
     <message>
         <location filename="../src/gui/sharedialog.cpp" line="203"/>
         <source>Password Protected</source>
-        <translation type="unfinished"/>
+        <translation>Parooliga kaitstud</translation>
     </message>
     <message>
         <location filename="../src/gui/sharedialog.cpp" line="343"/>

translations/client_fr.ts

@@ -1145,7 +1145,7 @@ L'assistant peut demander des privilèges additionnels durant le processus.
     <message>
         <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
         <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Attention :&lt;/strong&gt; Vous avez plusieurs dossiers configurés. Si vous continuez avec les paramètres actuels, ces configurations de dossiers seront perdues et une synchronisation de la racine de votre compte vers un seul dossier sera mise en place !&lt;/small&gt;&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Attention :&lt;/strong&gt; Vous avez plusieurs dossiers configurés. Si vous continuez avec les paramètres actuels, les configurations de dossiers existantes seront perdues et une synchronisation de la racine de votre compte vers un seul dossier sera mise en place !&lt;/small&gt;&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="149"/>
@@ -1601,7 +1601,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
     <message>
         <location filename="../src/libsync/propagateupload.cpp" line="557"/>
         <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
-        <translation>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</translation>
+        <translation>Arrêt forcé du job après réinitialisation de connexion HTTP avec Qt &lt; 5.4.2.</translation>
     </message>
     <message>
         <location filename="../src/libsync/propagateupload.cpp" line="565"/>

translations/client_th.ts

@@ -1764,7 +1764,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/gui/settingsdialog.cpp" line="76"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>บัญชี</translation>
     </message>
     <message>
         <location filename="../src/gui/settingsdialog.cpp" line="81"/>
@@ -1792,7 +1792,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/gui/settingsdialogmac.cpp" line="70"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>บัญชี</translation>
     </message>
     <message>
         <location filename="../src/gui/settingsdialogmac.cpp" line="74"/>
@@ -2632,7 +2632,7 @@ It is not advisable to use it.</source>
     <message>
         <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="88"/>
         <source>Server</source>
-        <translation type="unfinished"/>
+        <translation>เซิร์ฟเวอร์</translation>
     </message>
     <message>
         <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="265"/>
@@ -2975,7 +2975,7 @@ It is not advisable to use it.</source>
         <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
         <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
         <source>error</source>
-        <translation type="unfinished"/>
+        <translation>ข้อผิดพลาด</translation>
     </message>
 </context>
 <context>