Bump to rc2

[tx-robot] updated from transifex
2026-04-07 01:34:16 +02:00 · 2015-06-17 17:13:22 +02:00 · 2015-06-17 02:18:55 -04:00 · 2015-06-16 02:19:00 -04:00 · 2015-06-15 02:18:42 -04:00 · 2015-06-14 02:18:42 -04:00
56 changed files with 5781 additions and 1991 deletions
--- a/41
+++ b/41
@@ -1,30 +1,43 @@
 ChangeLog
 =========
-version 1.8.2 (release 2015-05-xx)
- * HTTP: Add the branding name to the UserAgent string.
- * ConnectonValidator: Always run with new credentials. (#3266)
+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)
+ * Improve reporting of server error messages (#3220)
+ * Discovery: Ignore folders with any 503 (#3113)
+ * Wizard: Show server error message if possible (#3220)
+ * QNAM: Fix handling of mitm cert changes (#3283)
+ * Win32: Installer translations added (#3277)
+ * Win32: Allow concurrent OEM (un-)installers (#3272)
+ * Win32: Make Setup/Update Mutex theme-unique (#3272)
+ * HTTP: Add the branding name to the UserAgent string
+ * ConnectonValidator: Always run with new credentials (#3266)
 * Recall Feature: Admins can trigger an upload of a file from
-   client to server again
- * Propagator: Add 'Content-Length: 0' header to MKCOL request
+   client to server again (#3246)
+ * Propagator: Add 'Content-Length: 0' header to MKCOL request (#3256)
 * Switch on checksum verification through branding or config
 * Add ability for checksum verification of up and download
 * Fix opening external links for some labels (#3135)
 * AccountState: Run only a single validator, allow error message
-   overriding (#3236 #3153)
+   overriding (#3236, #3153)
 * SyncJournalDB: Minor fixes and simplificatons
 * SyncEngine: Force re-read of folder Etags for upgrades from
   1.8.0 and 1.8.1
- * Propagator: Limit length of temporary file name #2789
- * ShareDialog: Password ui fixes. #3189
- * Fix startup hang by removing QSettings lock file. (#3175)
- * Wizard: Allow SSL cert dialog to show twice. (#3168)
- * ProtocolWidget: Fix rename message. (#3210)
+ * Propagator: Limit length of temporary file name (#2789)
+ * ShareDialog: Password ui fixes (#3189)
+ * Fix startup hang by removing QSettings lock file (#3175)
+ * Wizard: Allow SSL cert dialog to show twice (#3168)
+ * ProtocolWidget: Fix rename message (#3210)
 * Discovery: Test better, treat invalid hrefs as error (#3176)
- * Propagator: Overwrite local data only if unchanged. (#3156)
+ * Propagator: Overwrite local data only if unchanged (#3156)
 * ShareDialog: Improve error reporting for share API fails
- * OSX Updater: Only allow if in /Applications (#2931)
+ * OSX Updater: Only allow updates only if in /Applications (#2931)
 * Wizard: Fix lock icon (#1447)
- * Fix compile with gcc 5
+ * Fix compilation with GCC 5
 * Treat any 503 error as temporary (#3113)
 * Work around for the Qt PUT corruption bug (#2425)
 * OSX Shell integration: Optimizations
--- a/VERSION.cmake
+++ b/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 "beta1") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "rc2") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

 if( NOT DEFINED MIRALL_VERSION_BUILD )
--- a/admin/win/nsi/l10n/.tx/config
+++ b/admin/win/nsi/l10n/.tx/config
@@ -10,24 +10,25 @@ minimum_perc = 5

 # simple one-to-one language mappings
 trans.ca = pofiles/ca.po
-trans.el = pofiles/el.po  
-trans.es = pofiles/es.po  
-trans.es_AR = pofiles/es_AR.po  
-trans.eu = pofiles/eu.po  
-trans.fa = pofiles/fa.po 
-trans.fr = pofiles/fr.po 
-trans.gl = pofiles/gl.po  
-trans.it = pofiles/it.po  
-trans.nl = pofiles/nl.po    
-trans.pl = pofiles/pl.po     
-trans.pt_BR = pofiles/pt_BR.po  
-trans.ru = pofiles/ru.po    
+trans.el = pofiles/el.po
+trans.es_AR = pofiles/es_AR.po
+trans.es = pofiles/es.po
+trans.eu = pofiles/eu.po
+trans.fa = pofiles/fa.po
+trans.fr = pofiles/fr.po
+trans.gl = pofiles/gl.po
+trans.it = pofiles/it.po
+trans.nb_NO = pofiles/nb_NO.po
+trans.nl = pofiles/nl.po
+trans.pl = pofiles/pl.po
+trans.pt_BR = pofiles/pt_BR.po
+trans.ru = pofiles/ru.po
 trans.sl = pofiles/sl.po
 trans.sv = pofiles/sv.po
 trans.tr = pofiles/tr.po
-trans.uk = pofiles/uk.po     
-trans.zh_TW = pofiles/zh_TW.po  
-trans.zh_CN = pofiles/zh_CN.po  
+trans.uk = pofiles/uk.po
+trans.zh_CN = pofiles/zh_CN.po
+trans.zh_TW = pofiles/zh_TW.po

 # special handling below

@@ -35,14 +36,13 @@ trans.zh_CN = pofiles/zh_CN.po
 trans.de_DE = pofiles/de.po

 # choose one of the given translations on transifex as default
-trans.pt_PT = pofiles/pt.po  
+trans.pt_PT = pofiles/pt.po

 # choose a special language as more generic default
-trans.cs_CZ = pofiles/cs.po 
-trans.et_EE = pofiles/et.po 
-trans.fi_FI = pofiles/fi.po  
-trans.ja_JP = pofiles/ja.po  
-trans.hu_HU = pofiles/hu.po  
-trans.sk_SK = pofiles/sk.po  
-trans.th_TH = pofiles/th.po  
-
+trans.cs_CZ = pofiles/cs.po
+trans.et_EE = pofiles/et.po
+trans.fi_FI = pofiles/fi.po
+trans.hu_HU = pofiles/hu.po
+trans.ja_JP = pofiles/ja.po
+trans.sk_SK = pofiles/sk.po
+trans.th_TH = pofiles/th.po
--- a/admin/win/nsi/l10n/Norwegian.nsh
+++ b/admin/win/nsi/l10n/Norwegian.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Vis versjonsmerknader"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Fant ${APPLICATION_EXECUTABLE}-prosess(er) som må stoppes.$\nVil du at installasjonsprogrammet skal stoppe dem for deg?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Terminerer ${APPLICATION_EXECUTABLE}-prosesser."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Fant ikke prosess som skulle termineres!"
+StrCpy $PageReinstall_NEW_Field_1 "En eldre versjon av ${APPLICATION_NAME} er installert på systemet ditt. Det anbefales at du avnistallerer den versjonen før installering av ny versjon. Velg hva du vil gjøre og klikk Neste for å fortsette."
+StrCpy $PageReinstall_NEW_Field_2 "Avinstaller før installering"
+StrCpy $PageReinstall_NEW_Field_3 "Ikke avinstaller"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Allerede installert"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Velg hvordan du vil installere ${APPLICATION_NAME}."
+StrCpy $PageReinstall_OLD_Field_1 "En nyere versjon av ${APPLICATION_NAME} er allerede installert! Det anbefales ikke at du installerer en eldre versjon. Hvis du virkelig ønsker å installere denne eldre versjonen, er det bedre å avinstallere gjeldende versjon først. Velg hva du vil gjøre og klikk Neste for å fortsette."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} er allerede installert.\nVelg hva du vil gjøre og klikk Neste for å fortsette."
+StrCpy $PageReinstall_SAME_Field_2 "Legg til/installer komponenter på nytt"
+StrCpy $PageReinstall_SAME_Field_3 "Avinstaller ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstaller ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Velg hva slags vedlikehold som skal utføres."
+StrCpy $SEC_APPLICATION_DETAILS "Installerer ${APPLICATION_NAME} grunnleggende."
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integrering med Windows Utforsker"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installerer integrering med Windows Utforsker"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Snarvei i Start-menyen"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Legger til snarvei for ${APPLICATION_NAME} i Start-menyen."
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Snarvei på skrivebordet"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Oppretter snarveier på skrivebordet"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Snarvei i Hurtigstart"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Oppretter snarvei i Hurtigstart"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} grunnleggende."
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME}-snarvei."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Skrivebordssnarvei for ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Hurtigstart-snarvei for ${APPLICATION_NAME}."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Fjern ${APPLICATION_NAME} sin datamappe fra datamaskinen."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Ønsker du å slette ${APPLICATION_NAME} sin datamappe?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Ikke kryss av dersom du vil beholde datamappen for senere bruk. Kryss av for å slette mappen."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Ja, slett denne datamappen."
+StrCpy $UNINSTALLER_FILE_Detail "Skriver Avinstallasjonsprogram."
+StrCpy $UNINSTALLER_REGISTRY_Detail "Skriver registernøkler for installasjonsprogrammet"
+StrCpy $UNINSTALLER_FINISHED_Detail "Ferdig"
+StrCpy $UNINSTALL_MESSAGEBOX "Det ser ikke ut som ${APPLICATION_NAME} er installert i mappe '$INSTDIR'.$\n$\nFortsett likevel (ikke anbefalt)?"
+StrCpy $UNINSTALL_ABORT "Avinstallering avbrutt av bruker"
+StrCpy $INIT_NO_QUICK_LAUNCH "Hurtigstart-snarvei (I/T)"
+StrCpy $INIT_NO_DESKTOP "Snarvei på skrivebordet (skriver over eksisterende)"
+StrCpy $UAC_ERROR_ELEVATE "Klarte ikke å heve tilgangsnivå. Feil: "
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dette installasjonsprogrammet krever administrasjonstilgang. Prøv igjen"
+StrCpy $INIT_INSTALLER_RUNNING "Installasjonsprogrammet kjører allerede."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Avinstallasjonsprogrammet krever administrasjonstilgang. Prøv igjen"
+StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallasjonsprogrammet kjører allerede."
+StrCpy $SectionGroup_Shortcuts "Snarveier"
--- a/admin/win/nsi/l10n/Thai.nsh
+++ b/admin/win/nsi/l10n/Thai.nsh
@@ -0,0 +1,46 @@
+# Auto-generated - do not modify
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "แสดงบันทึกประจำรุ่น"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "พบว่ากระบวนการ ${APPLICATION_EXECUTABLE} จะต้องหยุดทำงาน\nคุณต้องการติดตั้งเพื่อหยุดการทำงานเหล่านี้ของคุณ?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "ฆ่ากระบวนการทำงาน ${APPLICATION_EXECUTABLE}"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "ไม่พบการฆ่ากระบวนการ!"
+StrCpy $PageReinstall_NEW_Field_1 "รุ่นเก่าของ ${APPLICATION_NAME} มีการติดตั้งในระบบของคุณ ขอแนะนำให้คุณถอนการติดตั้งรุ่นปัจจุบันออกก่อน เลือกการดำเนินการที่คุณต้องการที่จะดำเนินการและคลิกถัดไปเพื่อดำเนินการต่อ"
+StrCpy $PageReinstall_NEW_Field_2 "ถอนการติดตั้งก่อนการติดตั้ง"
+StrCpy $PageReinstall_NEW_Field_3 "อย่าถอนการติดตั้ง"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "ติดตั้งแล้ว"
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "เลือกวิธีที่คุณต้องการติดตั้ง ${APPLICATION_NAME}"
+StrCpy $PageReinstall_OLD_Field_1 "รุ่นใหม่ของ ${APPLICATION_NAME} ถูกติดตั้งแล้ว! เราไม่แนะนำให้คุณติดตั้งรุ่นเก่า ถ้าคุณอยากจะติดตั้งรุ่นเก่าก็สามารถสอนการติดตั้งได้"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ได้ถูกติดตั้งแล้ว เลือกการดำเนินการที่คุณต้องการที่จะดำเนินการและคลิกถัดไปเพื่อดำเนินการต่อ"
+StrCpy $PageReinstall_SAME_Field_2 "ส่วนประกอบ เพิ่ม/ติดตั้งใหม่ "
+StrCpy $PageReinstall_SAME_Field_3 "ถอนการติดตั้ง ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_TITLE "ถอนการติดตั้ง ${APPLICATION_NAME}"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "เลือกตัวเลือกการบำรุงรักษาเพื่อดำเนินการ"
+StrCpy $SEC_APPLICATION_DETAILS "กำลังติดตั้งข้อมูลที่เป็นเป็นของ ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "บูรณาการสำหรับ Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "บูรณาการกำลังติดตั้งสำหรับ Windows Explorer"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "โปรแกรมทางลัดเมนูเริ่มต้น"
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "เพิ่มทางลัดสำหรับ ${APPLICATION_NAME} ที่เมนูเริ่มต้น"
+StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "ทางลัดพื้นโต๊ะ"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "สร้างทางลัดบนเดสก์ทอป"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "ทางลัดเร่งด่วน"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "สร้างทางลัดเร่งด่วน"
+StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} ที่จำเป็น"
+StrCpy $OPTION_SECTION_SC_START_MENU_Desc "ทางลัด ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "ทางลัดบนเดสก์ทอปสำหรับ ${APPLICATION_NAME}"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "ทางลัดเร่งด่วนสำหรับ ${APPLICATION_NAME}"
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "ลบ ${APPLICATION_NAME} ของโฟลเดอร์ข้อมูลจากคอมพิวเตอร์ของคุณ"
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "คุณต้องการลบ ${APPLICATION_NAME} ของโฟลเดอร์ข้อมูล?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "ปล่อยให้ตรวจสอบสำหรับใช้โฟลเดอร์ข้อมูลในภายหลังหรือตรวจสอบเพื่อลบโฟลเดอร์ข้อมูล"
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "ใช่ลบโฟลเดอร์ข้อมูลนี้"
+StrCpy $UNINSTALLER_FILE_Detail "กำลังถอนการติดตั้ง"
+StrCpy $UNINSTALLER_REGISTRY_Detail "กำลังติดตั้งรหัสรีจิสทรี"
+StrCpy $UNINSTALLER_FINISHED_Detail "เสร็จสิ้น"
+StrCpy $UNINSTALL_MESSAGEBOX "มันจะไม่ปรากฏ ${APPLICATION_NAME} ที่มีการติดตั้งในไดเรกทอรี '$INSTDIR' ดำเนินการต่อไป (ไม่แนะนำ)?"
+StrCpy $UNINSTALL_ABORT "ถอนการติดตั้งถูกยกเลิกโดยผู้ใช้"
+StrCpy $INIT_NO_QUICK_LAUNCH "ทางลัดเร่งด่วน (N/A)"
+StrCpy $INIT_NO_DESKTOP "ทางลัดเดสก์ทอป (จะเขียนทับหากมีอยู่แล้ว)"
+StrCpy $UAC_ERROR_ELEVATE "ไม่สามารถที่จะยกระดับข้อผิดพลาด:"
+StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "การติดตั้งนี้จะต้องมีการเข้าถึงผู้ดูแลระบบ กรุณาลองอีกครั้ง"
+StrCpy $INIT_INSTALLER_RUNNING "กำลังทำการติดตั้ง"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "การถอนการติดตั้งนี้จะต้องมีการเข้าถึงส่วนผู้ดูแลระบบ กรุณาลองอีกครั้ง"
+StrCpy $INIT_UNINSTALLER_RUNNING "กำลังทำการถอนการติดตั้ง"
+StrCpy $SectionGroup_Shortcuts "ทางลัด"
--- a/admin/win/nsi/l10n/bin/build_locale_nsi.py
+++ b/admin/win/nsi/l10n/bin/build_locale_nsi.py
@@ -67,7 +67,7 @@ localeToName = {
    "mg" : "Malagasy",
    "ms" : "Malay",
    "mn" : "Mongolian",
-    "nb" : "Norwegian",
+    "nb_NO" : "Norwegian",
    "nn" : "NorwegianNynorsk",
    "ps" : "Pashto",
    "pl" : "Polish",
--- a/admin/win/nsi/l10n/bin/l10n.sh
+++ b/admin/win/nsi/l10n/bin/l10n.sh
@@ -44,5 +44,6 @@ iconv -t CP1252 -o Finnish.nsh Finnish.nsh
 iconv -t CP932 -o Japanese.nsh Japanese.nsh
 iconv -t CP1250 -o Slovak.nsh Slovak.nsh
 iconv -t CP1254 -o Turkish.nsh Turkish.nsh
+iconv -t CP1252 -o Norwegian.nsh Norwegian.nsh


--- a/admin/win/nsi/l10n/languages.nsh
+++ b/admin/win/nsi/l10n/languages.nsh
@@ -8,13 +8,15 @@
 !insertmacro MUI_LANGUAGE "Hungarian"
 !insertmacro MUI_LANGUAGE "Ukrainian"
 !insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "Thai"
 !insertmacro MUI_LANGUAGE "Finnish"
 !insertmacro MUI_LANGUAGE "Basque"
 !insertmacro MUI_LANGUAGE "Greek"
 !insertmacro MUI_LANGUAGE "SimpChinese"
 !insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Catalan"
 !insertmacro MUI_LANGUAGE "Italian"
 !insertmacro MUI_LANGUAGE "Portuguese"
 !insertmacro MUI_LANGUAGE "German"
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -175,10 +175,11 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
      StrCmp $LANGUAGE ${LANG_ITALIAN} Italian 0
      StrCmp $LANGUAGE ${LANG_ESTONIAN} Estonian 0
      StrCmp $LANGUAGE ${LANG_GREEK} Greek 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Basque 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Galician 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Slovak 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Turkish 0
+      StrCmp $LANGUAGE ${LANG_BASQUE} Basque 0
+      StrCmp $LANGUAGE ${LANG_GALICIAN} Galician 0
+      StrCmp $LANGUAGE ${LANG_SLOVAC} Slovak 0
+      StrCmp $LANGUAGE ${LANG_TURKISH} Turkish 0
+      StrCmp $LANGUAGE ${LANG_NORWEGIAN} Norwegian 0
      StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} Brazilian EndLanguageCmp
      German:
      !include "${source_path}/admin/win/nsi/l10n\German.nsh"
@@ -221,6 +222,9 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
      Goto EndLanguageCmp
      Brazilian:
      !include "${source_path}/admin/win/nsi/l10n\PortugueseBR.nsh"
+      Goto EndLanguageCmp
+      Norwegian:
+      !include "${source_path}/admin/win/nsi/l10n\Norwegian.nsh"
      EndLanguageCmp:

   FunctionEnd
@@ -475,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"
@@ -488,6 +493,7 @@ SectionEnd
      ${Endif}
      !undef LIBRARY_COM
      !undef LIBRARY_SHELL_EXTENSION
+      !undef LIBRARY_IGNORE_VERSION
   ${MementoSectionEnd}
 !endif

@@ -646,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
@@ -661,6 +668,7 @@ Section Uninstall
      ${EndIf}
      !undef LIBRARY_COM
      !undef LIBRARY_SHELL_EXTENSION
+      !undef LIBRARY_IGNORE_VERSION
  !endif

   ;Start menu shortcut
@@ -777,7 +785,7 @@ Function .onInit
      goto UAC_Elevate

   ;Prevent multiple instances.
-   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "owncloudInstaller") i .r1 ?e'
+   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${APPLICATION_SHORTNAME}Installer") i .r1 ?e'
   Pop $R0
   StrCmp $R0 0 +3
      MessageBox MB_OK|MB_ICONEXCLAMATION $INIT_INSTALLER_RUNNING
@@ -842,7 +850,7 @@ Function un.onInit
      goto UAC_Elevate

   ;Prevent multiple instances.
-   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "owncloudUninstaller") i .r1 ?e'
+   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${APPLICATION_SHORTNAME}Uninstaller") i .r1 ?e'
   Pop $R0
   StrCmp $R0 0 +3
      MessageBox MB_OK|MB_ICONEXCLAMATION $INIT_UNINSTALLER_RUNNING
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -621,7 +621,12 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
          if (asp < 0) {
              CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "asprintf failed!");
          }
-      } else if(errno == ERRNO_STORAGE_UNAVAILABLE) {
+      }
+      // The server usually replies with the custom "503 Storage not available"
+      // if some path is temporarily unavailable. But in some cases a standard 503
+      // is returned too. Thus we can't distinguish the two and will treat any
+      // 503 as request to ignore the folder. See #3113 #2884.
+      else if(errno == ERRNO_STORAGE_UNAVAILABLE || errno == ERRNO_SERVICE_UNAVAILABLE) {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Storage was not available!");
          if (ctx->current_fs) {
              ctx->current_fs->instruction = CSYNC_INSTRUCTION_IGNORE;
--- a/doc/architecture.rst
+++ b/doc/architecture.rst
@@ -25,9 +25,9 @@ The process of synchronization keeps files in two separate repositories the
 same. When synchronized:

 - If a file is added to one repository it is copied to the other synchronized repository.
- When a file is changed in one repository, the change is propagated to any
-  synchronized other repositories- If a file is deleted in one repository, it
-  is deleted in any other.
+- When a file is changed in one repository, the change is propagated to any other
+  synchronized repository.
+- If a file is deleted in one repository, it is deleted in any other.

 It is important to note that the ownCloud synchronization process does not use
 a typical client/server system where the server is always master.  This is a
--- a/doc/building.rst
+++ b/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:

--- a/doc/troubleshooting.rst
+++ b/doc/troubleshooting.rst
@@ -61,12 +61,12 @@ Other issues can affect synchronization of your ownCloud files:
  ensure that the folder to which you are synchronizing is not shared with
  other synchronization applications.

- Synchronizing the same directory with ownCloud and other
-     synchronization software such as Unison, rsync, Microsoft Windows Offline
-     Folders, or other cloud services such as DropBox or Microsoft SkyDrive is not
-     supported and should not be attempted. In the worst case, it is possible that
-     synchronizing folders or files using ownCloud and other synchronization
-     software or services can result in data loss.
+- Synchronizing the same directory with ownCloud and other synchronization
+  software such as Unison, rsync, Microsoft Windows Offline Folders, or other
+  cloud services such as DropBox or Microsoft SkyDrive is not supported and
+  should not be attempted. In the worst case, it is possible that synchronizing
+  folders or files using ownCloud and other synchronization software or
+  services can result in data loss.

 - If you find that only specific files are not synrchronized, the
  synchronization protocol might be having an effect. Some files are
@@ -80,9 +80,13 @@ Other issues can affect synchronization of your ownCloud files:

  .. note:: The data directory on the server is exclusive to ownCloud and must not be modified manually.

-  If you are using a different file backend on the server, you can try to exclude a bug in the
+- If you are using a different file backend on the server, you can try to exclude a bug in the
  backend by reverting to the built-in backend.

+- If you are experiencing slow upload/download speed or similar performance issues
+  be aware that those could be caused by on-access virus scanning solutions, either
+  on the server (like the files_antivirus app) or the client.
+
 Log Files
 ---------

@@ -125,9 +129,9 @@ mentioned above to save the log to a file.
  .. note:: You can also open a log window for an already running session, by
     restarting the client using the following command:

-  * Windows: ``C:\Program Files (x86)\ownCloud\owncloud.exe --logwindow``
-  * Mac OS X: ``/Applications/owncloud.app/Contents/MacOS/owncloud --logwindow``
-  * Linux: ``owncloud --logwindow``
+     * Windows: ``C:\Program Files (x86)\ownCloud\owncloud.exe --logwindow``
+     * Mac OS X: ``/Applications/owncloud.app/Contents/MacOS/owncloud --logwindow``
+     * Linux: ``owncloud --logwindow``

 Saving Files Directly
 ~~~~~~~~~~~~~~~~~~~~~
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -208,6 +208,7 @@ void AccountState::slotConnectionValidatorResult(ConnectionValidator::Status sta
        return;
    }

+    auto oldStatus = _connectionStatus;
    if (_connectionStatus != status) {
        qDebug() << "AccountState connection status change: "
                 << connectionStatusString(_connectionStatus) << "->"
@@ -219,7 +220,9 @@ void AccountState::slotConnectionValidatorResult(ConnectionValidator::Status sta
    switch (status)
    {
    case ConnectionValidator::Connected:
-        setState(Connected);
+        if (oldStatus != ConnectionValidator::Connected) {
+            setState(Connected);
+        }
        break;
    case ConnectionValidator::Undefined:
    case ConnectionValidator::NotConfigured:
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -267,11 +267,12 @@ void OwncloudSetupWizard::slotAuthError()

    // Provide messages for other errors, such as invalid credentials.
    } else if (reply->error() != QNetworkReply::NoError) {
-        errorMsg = reply->errorString();
        if (!_ocWizard->account()->credentials()->stillValid(reply)) {
            errorMsg = tr("Access forbidden by server. To verify that you have proper access, "
                          "<a href=\"%1\">click here</a> to access the service with your browser.")
                       .arg(_ocWizard->account()->url().toString());
+        } else {
+            errorMsg = errorMessage(reply->errorString(), reply->readAll());
        }

    // Something else went wrong, maybe the response was 200 but with invalid data.
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -503,6 +503,11 @@ void Account::slotHandleErrors(QNetworkReply *reply , QList<QSslError> errors)
        reply->ignoreSslErrors();
    } else {
        _treatSslErrorsAsFailure = true;
+        // if during normal operation, a new certificate was MITM'ed, and the user does not
+        // ACK it, the running request must be aborted and the QNAM must be reset, to not
+        // treat the new cert as granted. See bug #3283
+        reply->abort();
+        resetNetworkAccessManager();
        return;
    }
 }
--- a/src/libsync/connectionvalidator.cpp
+++ b/src/libsync/connectionvalidator.cpp
@@ -187,7 +187,7 @@ void ConnectionValidator::slotAuthFailed(QNetworkReply *reply)
        stat = CredentialsWrong;

    } else if( reply->error() != QNetworkReply::NoError ) {
-        _errors << reply->errorString();
+        _errors << errorMessage(reply->errorString(), reply->readAll());

        const int httpStatus =
                reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
--- a/src/libsync/filesystem.h
+++ b/src/libsync/filesystem.h
@@ -124,10 +124,10 @@ bool openAndSeekFileSharedRead(QFile* file, QString* error, qint64 seek);
 QString fileSystemForPath(const QString & path);
 #endif

-QByteArray calcMd5( const QString& fileName );
-QByteArray calcSha1( const QString& fileName );
+QByteArray OWNCLOUDSYNC_EXPORT calcMd5( const QString& fileName );
+QByteArray OWNCLOUDSYNC_EXPORT calcSha1( const QString& fileName );
 #ifdef ZLIB_FOUND
-QByteArray calcAdler32( const QString& fileName );
+QByteArray OWNCLOUDSYNC_EXPORT calcAdler32( const QString& fileName );
 #endif

 }}
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -851,7 +851,31 @@ bool JsonApiJob::finished()
    return true;
 }

+QString extractErrorMessage(const QByteArray& errorResponse)
+{
+    QXmlStreamReader reader(errorResponse);
+    reader.readNextStartElement();
+    if (reader.name() != "error") {
+        return QString::null;
+    }

+    while (!reader.atEnd() && reader.error() == QXmlStreamReader::NoError) {
+        reader.readNextStartElement();
+        if (reader.name() == QLatin1String("message")) {
+            return reader.readElementText();
+        }
+    }
+    return QString::null;
+}

+QString errorMessage(const QString& baseError, const QByteArray& body)
+{
+    QString msg = baseError;
+    QString extra = extractErrorMessage(body);
+    if (!extra.isEmpty()) {
+        msg += QString::fromLatin1(" (%1)").arg(extra);
+    }
+    return msg;
+}

 } // namespace OCC
--- a/src/libsync/networkjobs.h
+++ b/src/libsync/networkjobs.h
@@ -314,6 +314,17 @@ signals:
    void jsonRecieved(const QVariantMap &json);
 };

+/** Gets the SabreDAV-style error message from an error response.
+ *
+ * This assumes the response is XML with a 'error' tag that has a
+ * 'message' tag that contains the data to extract.
+ *
+ * Returns a null string if no message was found.
+ */
+QString OWNCLOUDSYNC_EXPORT extractErrorMessage(const QByteArray& errorResponse);
+
+/** Builds a error message based on the error and the reply body. */
+QString OWNCLOUDSYNC_EXPORT errorMessage(const QString& baseError, const QByteArray& body);

 } // namespace OCC

--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -566,14 +566,9 @@ void PropagateUploadFileQNAM::slotPutFinished()
               "It is restored and your edit is in the conflict file."))) {
            return;
        }
-        QString errorString = job->errorString();
-
        QByteArray replyContent = job->reply()->readAll();
        qDebug() << replyContent; // display the XML error in the debug
-        QRegExp rx("<s:message>(.*)</s:message>"); // Issue #1366: display server exception
-        if (rx.indexIn(QString::fromUtf8(replyContent)) != -1) {
-            errorString += QLatin1String(" (") + rx.cap(1) + QLatin1Char(')');
-        }
+        QString errorString = errorMessage(job->errorString(), replyContent);

        if (job->reply()->hasRawHeader("OC-ErrorString")) {
            errorString = job->reply()->rawHeader("OC-ErrorString");
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -119,6 +119,7 @@ void PropagateLocalMkdir::start()
        done( SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirStr) );
        return;
    }
+    _propagator->addTouchedFile(newDirStr);
    QDir localDir(_propagator->_localDir);
    if (!localDir.mkpath(_item._file)) {
        done( SyncFileItem::NormalError, tr("could not create directory %1").arg(newDirStr) );
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -75,7 +75,7 @@ SyncEngine::SyncEngine(AccountPtr account, CSYNC *ctx, const QString& localPath,
    qRegisterMetaType<SyncFileItem::Status>("SyncFileItem::Status");
    qRegisterMetaType<Progress::Info>("Progress::Info");

-    _thread.setObjectName("CSync_Neon_Thread");
+    _thread.setObjectName("SyncEngine_Thread");
    _thread.start();
 }

--- a/src/libsync/transmissionchecksumvalidator.h
+++ b/src/libsync/transmissionchecksumvalidator.h
@@ -14,13 +14,15 @@

 #pragma once

+#include "owncloudlib.h"
+
 #include <QObject>
 #include <QByteArray>
 #include <QFutureWatcher>

 namespace OCC {

-class TransmissionChecksumValidator : public QObject
+class OWNCLOUDSYNC_EXPORT TransmissionChecksumValidator : public QObject
 {
    Q_OBJECT
 public:
--- a/translations/.tx/config
+++ b/translations/.tx/config
@@ -16,6 +16,7 @@ trans.fa = client_fa.ts
 trans.fr = client_fr.ts
 trans.gl = client_gl.ts
 trans.it = client_it.ts
+trans.nb_NO = client_nb_NO.ts
 trans.nl = client_nl.ts
 trans.pl = client_pl.ts
 trans.pt_BR = client_pt_BR.ts
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -714,22 +714,22 @@ Esteu segur que voleu executar aquesta operació?</translation>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>No s&apos;ha rebut cap E-Tag del servidor, comproveu el Proxy/Gateway</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Hem rebut un E-Tag diferent en la represa. Es comprovarà la pròxima vegada.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>El servidor retorna un error de contingut o rang</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Temps de connexió excedit</translation>
    </message>
@@ -1066,7 +1066,7 @@ Els elements marcats també s&apos;eliminaran si prevenen l&apos;eliminació d&a
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="56"/>
        <source>New %1 Update Ready</source>
-        <translation type="unfinished"/>
+        <translation>Nova actualització de %1 preparada</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="57"/>
@@ -1251,114 +1251,114 @@ No és aconsellada usar-la.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>La carpeta local %1 ja existeix, s&apos;està configurant per sincronitzar.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>correcte</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>ha fallat.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>No s&apos;ha pogut crear la carpeta local %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>No heu especificat cap carpeta remota!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Error: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>creant la carpeta a ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>La carpeta remota %1 s&apos;ha creat correctament.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>La carpeta remota %1 ja existeix. S&apos;hi està connectant per sincronitzar-les.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>La creació de la carpeta ha resultat en el codi d&apos;error HTTP %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Ha fallat la creació de la carpeta perquè les credencials proporcionades són incorrectes!&lt;br/&gt;Aneu enrera i comproveu les credencials.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;La creació de la carpeta remota ha fallat, probablement perquè les credencials facilitades són incorrectes.&lt;/font&gt;&lt;br/&gt;Comproveu les vostres credencials.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>La creació de la carpeta remota %1 ha fallat amb l&apos;error &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>S&apos;ha establert una connexió de sincronització des de %1 a la carpeta remota %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Connectat amb èxit a %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>No s&apos;ha pogut establir la connexió amb %1. Comproveu-ho de nou.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Ha fallat en canviar el nom de la carpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>No es pot esborrar i restaurar la carpeta perquè una carpeta o un fitxer de dins està obert en un altre programa. Tanqueu la carpeta o el fitxer i intenteu-ho de nou o cancel·leu la configuració.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;la carpeta de sincronització %1 s&apos;ha creat correctament!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1397,7 +1397,7 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Temps de connexió excedit</translation>
    </message>
@@ -1405,7 +1405,7 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1441,22 +1441,22 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d&apos;un fitxer local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1487,7 +1487,7 @@ No és aconsellada usar-la.</translation>
        <translation>Atenció, possible xoc entre majúscules i minúscules amb %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>No s&apos;ha pogut crear el directori %1</translation>
    </message>
@@ -1513,7 +1513,7 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>El fitxer %1 no es pot reanomenar a %2 perquè hi ha un xoc amb el nom d&apos;un fitxer local</translation>
    </message>
@@ -1584,38 +1584,43 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>El fitxer local ha canviat durant la sincronització.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>El fitxer s&apos;ha editat localment però és part d&apos;una compartició només de lectura. S&apos;ha restaurat i la vostra edició és en el fitxer en conflicte.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>El fitxer local s&apos;ha eliminat durant la sincronització.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>El servidor no ha reconegut l&apos;últim fragment. (No hi havia e-Tag)</translation>
    </message>
@@ -2435,21 +2440,35 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2843,27 +2862,27 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2884,7 +2903,7 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Construït de la revisió de Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; el %4 de %3 usant Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>Cílový soubor má neočekávanou velikost nebo čas změny</translation>
    </message>
@@ -713,22 +713,22 @@ Opravdu chcete provést tuto akci?</translation>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Server odpověděl chybným rozsahem obsahu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Čas spojení vypršel</translation>
    </message>
@@ -1250,114 +1250,114 @@ Nedoporučuje se jí používat.</translation>
        <translation>Ověřený požadavek na server byl přesměrován na &apos;%1&apos;. URL je špatně, server není správně nakonfigurován.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Byla obdržena nesprávná odpověď na ověřený webdav požadavek</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Přístup zamítnut serverem. Pro ověření správných přístupových práv &lt;a href=&quot;%1&quot;&gt;klikněte sem&lt;/a&gt; a otevřete službu ve svém prohlížeči.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Místní synchronizovaná složka %1 již existuje, nastavuji ji pro synchronizaci.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Vytvářím místní adresář pro synchronizaci %1...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>OK</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>selhalo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Nelze vytvořit místní složku %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Žádná vzdálená složka nenastavena!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Chyba: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>vytvářím složku na ownCloudu: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Vzdálená složka %1 byla úspěšně vytvořena.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Vzdálená složka %1 již existuje. Spojuji ji pro synchronizaci.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Vytvoření složky selhalo HTTP chybou %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;br/&gt;Vraťte se, prosím, zpět a zkontrolujte je.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;/font&gt;&lt;br/&gt;Vraťte se, prosím, zpět a zkontrolujte je.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Vytváření vzdálené složky %1 selhalo s chybou &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Bylo nastaveno synchronizované spojení z %1 do vzdáleného adresáře %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Úspěšně spojeno s %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Spojení s %1 nelze navázat. Prosím zkuste to znovu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Přejmenování složky selhalo</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Nelze odstranit a zazálohovat adresář, protože adresář nebo soubor v něm je otevřen v jiném programu. Prosím zavřete adresář nebo soubor a zkuste znovu nebo zrušte akci.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Místní synchronizovaná složka %1 byla vytvořena úspěšně!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1396,7 +1396,7 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Čas spojení vypršel</translation>
    </message>
@@ -1404,7 +1404,7 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Neplatná JSON odpověď z adresy URL</translation>
    </message>
@@ -1440,22 +1440,22 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Soubor nemohl být kompletně stažen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>Soubor se mezitím změnil</translation>
    </message>
@@ -1486,7 +1486,7 @@ Nedoporučuje se jí používat.</translation>
        <translation>Pozor, možná kolize z důvodu velikosti písmen s %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>nepodařilo se vytvořit adresář %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu se souborem v místním systému</translation>
    </message>
@@ -1583,38 +1583,43 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Soubor odebrán</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Místní soubor se během synchronizace změnil. </translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Místní soubor byl změněn během synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Vynucené ukončení procesu při resetu HTTP připojení s Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>Chybí adresa URL</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Místní soubor byl odstraněn během synchronizace.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
    </message>
@@ -2440,21 +2445,35 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Verze %1. Více informací na &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Šíří %1 pod licencí GNU General Public License (GPL) Verze 2.0.&lt;br/&gt;%2 a %2 logo jsou registrované známky %1 ve Spojených Státech, ostatních zemích, nebo obojí.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>Hlavička kontrolního součtu je poškozena.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>Stažený soubor neodpovídá kontrolnímu součtu, bude znovu stažen.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2848,27 +2867,27 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2889,7 +2908,7 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Sestaveno na Git revizi &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; na %3, %4 s použitím Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>Die Zieldatei hat eine unerwartete Größe oder ein unerwartetes Änderungsdatum</translation>
    </message>
@@ -170,7 +170,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="483"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
-        <translation>Die Synchronistation läuft gerade.&lt;br/&gt;Wollen Sie sie beenden?</translation>
+        <translation>Die Synchronisation läuft gerade.&lt;br/&gt;Wollen Sie sie beenden?</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="606"/>
@@ -714,22 +714,22 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Server hat falschen Bereich für den Inhalt zurück gegeben</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Zeitüberschreitung der Verbindung</translation>
    </message>
@@ -1250,114 +1250,114 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Die Authentifizierungs-Anfrage an den Server wurde weitergeleitet an &apos;%1&apos;. Diese Adresse ist ungültig, der Server ist falsch konfiguriert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Es gab eine ungültige Reaktion auf eine WebDav-Authentifizeriungs-Anfrage</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Zugang vom Server nicht erlaubt. &lt;a href=&quot;%1&quot;&gt;Klicken Sie hier&lt;/a&gt; zum Zugriff auf den Dienst mithilfe Ihres Browsers, so dass Sie sicherstellen können, dass Ihr Zugang ordnungsgemäß funktioniert.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Lokaler Sync-Ordner %1 existiert bereits, aktiviere Synchronistation.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Lokaler Synchronisations-Ordner %1 wird erstellt ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Der lokale Ordner %1 konnte nicht angelegt werden</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Keinen entfernten Ordner angegeben!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Fehler: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>erstelle Ordner auf ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Remoteordner %1 erfolgreich erstellt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Der Ordner %1 ist auf dem Server bereits vorhanden. Verbinde zur Synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehen Sie zurück und überprüfen Sie die Zugangsdaten.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Die Remote-Ordner-Erstellung ist fehlgeschlagen, vermutlich sind die angegebenen Zugangsdaten falsch.&lt;/font&gt;&lt;br/&gt;Bitte gehen Sie zurück und überprüfen Sie Ihre Zugangsdaten.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Eine Synchronisationsverbindung für Ordner %1 zum entfernten Ordner %2 wurde eingerichtet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Erfolgreich verbunden mit %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Die Verbindung zu %1 konnte nicht hergestellt werden. Bitte prüfen Sie die Einstellungen erneut.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Ordner umbenennen fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Der Ordner kann nicht entfernt und gesichert werden, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner oder die Datei oder beenden Sie die Installation.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Lokaler Sync-Ordner %1 erfolgreich erstellt!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1396,7 +1396,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Zeitüberschreitung der Verbindung</translation>
    </message>
@@ -1404,7 +1404,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Ungültige JSON-Antwort von der Poll-URL</translation>
    </message>
@@ -1440,22 +1440,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>Datei ist seit der Entdeckung geändert worden</translation>
    </message>
@@ -1486,7 +1486,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
        <translation>Achtung, es könnte ein Problem mit der Groß- und Kleinschreibung für %1 auftreten</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
    </message>
@@ -1512,7 +1512,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden</translation>
    </message>
@@ -1583,38 +1583,43 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Datei gelöscht</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Auftragsabbruch beim Rücksetzen der HTTP-Verbindung mit QT &lt; 5.4.2 wird erzwungen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>Poll-URL fehlt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
    </message>
@@ -2439,21 +2444,35 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Version %1. Für weitere Informationen besuchen Sie bitte &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Zur Verfügung gestellt durch %1 und lizenziert unter der GNU General Public License (GPL) Version 2.0.&lt;br&gt;%2 und das %2 Logo sind eingetragene Warenzeichen von %1 in den Vereinigten Staaten, anderen Ländern oder beides.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>Der Prüfsummen-Header hat ein fehlerhaftes Format.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>Die heruntergeladene Datei entspricht nicht der Prüfsumme, das Herunterladen wird wiederaufgenommen.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2847,27 +2866,27 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2888,7 +2907,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Gebaut von der GIT-Revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; auf %3, %4 verwendet Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>Το αρχείο προορισμού έχει μη αναμενόμενο μέγεθος ή χρόνο τροποποίησης</translation>
    </message>
@@ -714,22 +714,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Δεν ελήφθη E-Tag από το διακομιστή, ελέγξτε το διακομιστή μεσολάβησης/πύλη</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
    </message>
@@ -1251,114 +1251,114 @@ It is not advisable to use it.</source>
        <translation>Η πιστοποιημένη αίτηση στον διακομιστή ανακατευθύνθηκε σε &apos;%1&apos;. Το URL είναι εσφαλμένο, ο διακομιστής δεν έχει διαμορφωθεί σωστά.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Υπήρξε μια άκυρη απόκριση σε μια πιστοποιημένη αίτηση </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Απαγόρευση πρόσβασης από τον διακομιστή. Για να επιβεβαιώσετε ότι έχετε δικαιώματα πρόσβασης, &lt;a href=&quot;%1&quot;&gt;πατήστε εδώ&lt;/a&gt; για να προσπελάσετε την υπηρεσία με το πρόγραμμα πλοήγησής σας.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Ο τοπικός φάκελος συγχρονισμού %1 υπάρχει ήδη, ρύθμιση για συγχρονισμό.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Δημιουργία τοπικού φακέλου συγχρονισμού %1...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>οκ</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>απέτυχε.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Αδυναμία δημιουργίας τοπικού φακέλου %1 </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Δεν προσδιορίστηκε κανένας απομακρυσμένος φάκελος!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Σφάλμα: %1 </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>δημιουργία φακέλου στο ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Ο απομακρυσμένος φάκελος %1 δημιουργήθηκε με επιτυχία.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Ο απομακρυσμένος φάκελος %1 υπάρχει ήδη. Θα συνδεθεί για συγχρονισμό. </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Η δημιουργία φακέλου είχε ως αποτέλεσμα τον κωδικό σφάλματος HTTP %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Η δημιουργία απομακρυσμένου φακέλλου απέτυχε επειδή τα διαπιστευτήρια είναι λάθος!&lt;br/&gt;Παρακαλώ επιστρέψετε και ελέγξετε τα διαπιστευτήριά σας.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Η δημιουργία απομακρυσμένου φακέλου απέτυχε, πιθανώς επειδή τα διαπιστευτήρια που δόθηκαν είναι λάθος.&lt;/font&gt;&lt;br/&gt;Παρακαλώ επιστρέψτε πίσω και ελέγξτε τα διαπιστευτήρια σας.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Η δημιουργία απομακρυσμένου φακέλου %1 απέτυχε με σφάλμα &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Μια σύνδεση συγχρονισμού από τον απομακρυσμένο κατάλογο %1 σε %2 έχει ρυθμιστεί. </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Επιτυχής σύνδεση με %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Αποτυχία μετονομασίας φακέλου</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας του φακέλου διότι ο φάκελος ή ένα αρχείο του είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Επιτυχής δημιουργία τοπικού φακέλου %1 για συγχρονισμό!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1397,7 +1397,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
    </message>
@@ -1405,7 +1405,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Λανθασμένη απάντηση JSON από την ιστοσελίδα poll</translation>
    </message>
@@ -1441,22 +1441,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
    </message>
@@ -1487,7 +1487,7 @@ It is not advisable to use it.</source>
        <translation>Προσοχή, πιθανή διένεξη κεφαλαίων-πεζών γραμμάτων με το %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>αδυναμία δημιουργίας καταλόγου %1</translation>
    </message>
@@ -1513,7 +1513,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Το αρχείο %1 δεν είναι δυνατό να μετονομαστεί σε %2 λόγω μιας διένεξης με το όνομα ενός τοπικού αρχείου</translation>
    </message>
@@ -1584,38 +1584,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Το αρχείο αφαιρέθηκε</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt &lt; 5.4.2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και το επεξεργασμένο βρίσκεται στο αρχείο συγκρούσεων.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>Η διεύθυνση poll URL λείπει</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
    </message>
@@ -2441,21 +2446,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Έκδοση %1. Για περισσότερες πληροφορίες δείτε &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Πνευματικά δικαιώματα ownCloud, Ανώνυμη Εταιρία&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Διανέμεται από 1% και υπό την άδεια GNU General Public License (GPL) έκδοση 2.0.&lt;br/&gt;% 2 και το 2% το λογότυπο είναι σήματα κατατεθέντα της 1% στις Ηνωμένες Πολιτείες, άλλες χώρες, ή και τα δύο.&lt;/ p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>Η κεφαλίδα του αθροίσματος ελέγχου δεν είναι σωστά διαμορφωμένη.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>Το αρχείο που μεταφορτώθηκε δεν επαληθεύει το άθροισμα ελέγχου, θα συγχρονιστεί πάλι.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2849,27 +2868,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2890,7 +2909,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Δημιουργήθηκε από την διασκευή Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; στο %3, %4 χρησιμοποιώντας Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -4,7 +4,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"></translation>
    </message>
@@ -712,22 +712,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1245,114 +1245,114 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1391,7 +1391,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1399,7 +1399,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1435,22 +1435,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1481,7 +1481,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1507,7 +1507,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1578,38 +1578,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2433,21 +2438,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2841,27 +2860,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation type="unfinished"></translation>
    </message>
@@ -2882,7 +2901,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>El archivo destino tiene un tamaño o fecha/hora de modificación no esperado.</translation>
    </message>
@@ -713,22 +713,22 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>No se recibió ninguna e-tag del servidor, revise el proxy/gateway</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>El servidor devolvió un content-range erróneo</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Tiempo de espera de conexión agotado</translation>
    </message>
@@ -1249,114 +1249,114 @@ No se recomienda usarla.</translation>
        <translation>La petición autenticada al servidor fue redirigida a &apos;%1&apos;. La dirección URL es anómala, el servidor está mal configurado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Hubo una respuesta no válida a una solicitud autenticada de webdav</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Acceso denegado por el servidor. Para verificar que usted tiene acceso, &lt;a href=&quot;%1&quot;&gt;haga clic aquí&lt;/a&gt; para acceder al servicio con su navegador.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>La carpeta de sincronización local %1 ya existe, configurándola para la sincronización.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Creando carpeta de sincronización local %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>bien</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>falló.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>No se pudo crear carpeta local %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>¡No se ha especificado ninguna carpeta remota!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Error: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>creando carpeta en ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Carpeta remota %1 creado correctamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>La carpeta remota %1 ya existe. Conectándola para sincronizacion.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>La creación de la carpeta causó un error HTTP de código %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!&lt;br/&gt;Por favor, vuelva atrás y compruebe sus credenciales&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;La creación de la carpeta remota ha fallado, probablemente porque las credenciales proporcionadas son incorrectas.&lt;/font&gt;&lt;br/&gt;Por favor, vuelva atrás y compruebe sus credenciales.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Creación %1 de carpeta remota ha fallado con el error &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Se ha configarado una conexión de sincronización desde %1 al directorio remoto %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>¡Conectado con éxito a %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Conexión a %1 no se pudo establecer. Por favor compruebelo de nuevo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Error al renombrar la carpeta</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>No se puede eliminar y respaldar la carpeta porque la misma o un fichero en ella está abierto por otro programa. Por favor, cierre la carpeta o el fichero y reintente, o cancele la instalación.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Carpeta de sincronización local %1 creada con éxito&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1395,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Tiempo de espera de conexión agotado</translation>
    </message>
@@ -1403,7 +1403,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Respuesta JSON invalida desde URL</translation>
    </message>
@@ -1439,22 +1439,22 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>No se pudo descargar el archivo completamente.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>El archivo ha cambiado desde que fue descubierto</translation>
    </message>
@@ -1485,7 +1485,7 @@ No se recomienda usarla.</translation>
        <translation>Atención, posible error de mayúsculas/minúsculas en %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>No se pudo crear el directorio %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>El archivo %1 no se puede renombrar a %2 por causa de un conflicto con el nombre de un archivo local</translation>
    </message>
@@ -1582,38 +1582,43 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Archivo eliminado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Archivo local cambió durante la sincronización. Será actualizado.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Un archivo local fue modificado durante la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzar el trabajo en una conexión HTTP, causará un Reset si Qt&lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>El archivo fue modificado localmente; pero es parte de una carpeta compartida en modo de sólo lectura. Ha sido recuperado y su modificación está en el archivo de conflicto.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>URL de encuesta faltante</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>El archivo local fue eliminado durante la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>El servidor no reconoció la última parte. (No había una e-tag presente.)</translation>
    </message>
@@ -2436,21 +2441,35 @@ No se recomienda usarla.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;La versión %1. Para obtener más información, visite&lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, incorporado&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Distribuido por %1 y con licencia GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 y el lo de %2 son marcas registradas de %1 en los Estados Unidos y otros países, o ambos.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>La cabecera del archivo de comprobación es incorrecto.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>El archivo descargado no coincide con el archivo de comprobación, será reanudado.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2844,27 +2863,27 @@ No se recomienda usarla.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2885,7 +2904,7 @@ No se recomienda usarla.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Construido desde la revisión Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; en %3, %4 usando Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -712,22 +712,22 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation type="unfinished"/>
    </message>
@@ -1247,114 +1247,114 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>El directorio de sincronización local %1 ya existe, configurándolo para la sincronización.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>aceptar</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>Error.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>No fue posible crear el directorio local %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>¡No se ha especificado un directorio remoto!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Error: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>Creando carpeta en ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>El directorio remoto %1 fue creado con éxito.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>El directorio remoto %1 ya existe. Estableciendo conexión para sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>La creación del directorio resultó en un error HTTP con código de error %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Error al crear el directorio remoto porque las credenciales provistas son incorrectas.&lt;/font&gt;&lt;br/&gt;Por favor, volvé atrás y verificá tus credenciales.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Error al crear el directorio remoto, probablemente porque las credenciales provistas son incorrectas.&lt;/font&gt;&lt;br/&gt;Por favor, volvé atrás y verificá tus credenciales.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Se prtodujo un error &lt;tt&gt;%2&lt;/tt&gt; al crear el directorio remoto %1.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Fue creada una conexión de sincronización desde %1 al directorio remoto %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Conectado con éxito a %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>No fue posible establecer la conexión a %1. Por favor, intentalo nuevamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Error Al Renombrar Directorio</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Directorio local %1 creado&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1393,7 +1393,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation type="unfinished"/>
    </message>
@@ -1401,7 +1401,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1437,22 +1437,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1483,7 +1483,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation type="unfinished"/>
    </message>
@@ -1509,7 +1509,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
@@ -1580,38 +1580,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2429,21 +2434,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2838,27 +2857,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2879,7 +2898,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -702,33 +702,33 @@ 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>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Server tagastas vale vahemiku</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Ühenduse aegumine</translation>
    </message>
@@ -1249,114 +1249,114 @@ Selle kasutamine pole soovitatav.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Kohalik kataloog %1 on juba olemas. Valmistan selle ette sünkroniseerimiseks.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Ei suuda tekitada kohalikku kataloogi %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Ühtegi võrgukataloogi pole määratletud!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Viga: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>loon uue kataloogi ownCloudi: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Eemalolev kaust  %1 on loodud.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Serveris on kataloog %1 juba olemas. Ühendan selle sünkroniseerimiseks.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Kausta tekitamine lõppes HTTP veakoodiga %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Kataloogi loomine serverisse ebaõnnestus, kuna kasutajatõendid on valed!&lt;br/&gt;Palun kontrolli oma kasutajatunnust ja parooli.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Serveris oleva kataloogi tekitamine ebaõnnestus tõenäoliselt valede kasutajatunnuste tõttu.&lt;/font&gt;&lt;br/&gt;Palun mine tagasi ning kontrolli kasutajatunnust ning parooli.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Kataloogi %1 tekitamine serverisse ebaõnnestus veaga &lt;tt&gt;%2&lt;/tt&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Loodi sünkroniseerimisühendus kataloogist %1 serveri kataloogi %2</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Edukalt ühendatud %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Ühenduse loomine %1 ebaõnnestus. Palun kontrolli uuesti.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Kataloogi ümbernimetamine ebaõnnestus</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Ei suuda eemaldada ning varundada kataloogi kuna kataloog või selles asuv fail on avatud mõne teise programmi poolt. Palun sulge kataloog või fail ning proovi uuesti või katkesta paigaldus.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Kohalik kataloog %1 edukalt loodud!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1395,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Ühenduse aegumine</translation>
    </message>
@@ -1403,7 +1403,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1439,22 +1439,22 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1485,7 +1485,7 @@ Selle kasutamine pole soovitatav.</translation>
        <translation>Tähelepanu, võimalik tõusutundliku nime konflikt %1-ga</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>ei suuda luua kataloogi %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Faili %1 ei saa ümber nimetada %2-ks, kuna on konflikt kohaliku faili nimega</translation>
    </message>
@@ -1582,38 +1582,43 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Fail eemaldatud</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Server ei tunnistanud viimast tükki. (E-silt puudus).</translation>
    </message>
@@ -1857,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"/>
@@ -1887,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"/>
@@ -2433,21 +2438,35 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2841,27 +2860,27 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2882,7 +2901,7 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -713,22 +713,22 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Jarraitzeko E-Tag ezberdina jaso dugu. Hurrengoan saiatuko gara berriz.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Konexioa denboraz kanpo</translation>
    </message>
@@ -1249,114 +1249,114 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Bertako %1 karpeta dagoeneko existitzen da, sinkronizaziorako prestatzen.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ados</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>huts egin du.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Ezin da %1 karpeta lokala sortu</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Ez da urruneko karpeta zehaztu!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Errorea: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>ownClouden karpeta sortzen: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Urruneko %1 karpeta ongi sortu da.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Urruneko %1 karpeta dagoeneko existintzen da. Bertara konetatuko da sinkronizatzeko.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Karpeta sortzeak HTTP %1 errore kodea igorri du</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Huts egin du urrutiko karpeta sortzen emandako kredintzialak ez direlako zuzenak!&lt;br/&gt; Egin atzera eta egiaztatu zure kredentzialak.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Urruneko karpeten sortzeak  huts egin du ziuraski emandako kredentzialak gaizki daudelako.&lt;/font&gt;&lt;br/&gt;Mesedez atzera joan eta egiaztatu zure kredentzialak.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Urruneko %1 karpetaren sortzeak huts egin du &lt;tt&gt;%2&lt;/tt&gt; errorearekin.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Sinkronizazio konexio bat konfiguratu da %1 karpetatik urruneko %2 karpetara.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>%1-era ongi konektatu da!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>%1 konexioa ezin da ezarri. Mesedez egiaztatu berriz.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Karpetaren berrizendatzeak huts egin du</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Bertako sinkronizazio %1 karpeta ongi sortu da!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1395,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Konexioa denboraz kanpo</translation>
    </message>
@@ -1403,7 +1403,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1439,22 +1439,22 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1485,7 +1485,7 @@ Ez da gomendagarria erabltzea.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>Ezin izan da %1 karpeta sortu</translation>
    </message>
@@ -1511,7 +1511,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
@@ -1582,38 +1582,43 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2431,21 +2436,35 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2839,27 +2858,27 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2880,7 +2899,7 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -712,22 +712,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>تایم اوت اتصال</translation>
    </message>
@@ -1245,114 +1245,114 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>پوشه همگام سازی محلی %1 در حال حاضر موجود است، تنظیم آن برای همگام سازی. &lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>خوب</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>ناموفق.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>نمی تواند پوشه محلی ایجاد کند %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>خطا: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>ایجاد کردن پوشه بر روی ownCloud:  %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>پوشه از راه دور %1 با موفقیت ایجاد شده است.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>در حال حاضر پوشه از راه دور %1 موجود است. برای همگام سازی به آن متصل شوید.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>ایجاد پوشه از راه دور ناموفق بود به علت اینکه اعتبارهای ارائه شده اشتباه هستند!&lt;br/&gt;لطفا اعتبارهای خودتان را بررسی کنید.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt; ایجاد پوشه از راه دور  ناموفق بود، شاید به علت اعتبارهایی که ارئه شده اند، اشتباه هستند.&lt;/font&gt;&lt;br/&gt; لطفا باز گردید و اعتبار خود را بررسی کنید.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>ایجاد پوشه از راه دور %1 ناموفق بود با خطا &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>یک اتصال همگام سازی از %1 تا %2 پوشه از راه دور راه اندازی شد.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>با موفقیت به %1 اتصال یافت!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>اتصال به %1 نمی تواند مقرر باشد. لطفا دوباره بررسی کنید.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>تغییر نام پوشه ناموفق بود</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt; پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1391,7 +1391,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>تایم اوت اتصال</translation>
    </message>
@@ -1399,7 +1399,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1435,22 +1435,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1481,7 +1481,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation type="unfinished"/>
    </message>
@@ -1507,7 +1507,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
@@ -1578,38 +1578,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2427,21 +2432,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2835,27 +2854,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation type="unfinished"/>
    </message>
@@ -2876,7 +2895,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -711,22 +711,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Yhteys aikakatkaistiin</translation>
    </message>
@@ -1245,114 +1245,114 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Palvelin esti käyttämisen. Vahvista käyttöoikeutesi palvelimeen &lt;a href=&quot;%1&quot;&gt;napsauttamalla tästä&lt;/a&gt; ja kirjaudu palveluun selaimella.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Paikallinen kansio %1 on jo olemassa, asetetaan se synkronoitavaksi.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>epäonnistui.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Paikalliskansion %1 luonti epäonnistui</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Etäkansiota ei määritelty!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Virhe: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>luodaan kansio ownCloudiin: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Etäkansio %1 luotiin onnistuneesti.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Etäkansio %1 on jo olemassa. Otetaan siihen yhteyttä tiedostojen täsmäystä varten.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Kansion luonti aiheutti HTTP-virhekoodin %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Etäkansion luominen epäonnistui koska antamasi tunnus/salasana ei täsmää!&lt;br/&gt;Ole hyvä ja palaa tarkistamaan tunnus/salasana&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Pilvipalvelun etäkansion luominen ei onnistunut , koska tunnistautumistietosi ovat todennäköisesti väärin.&lt;/font&gt;&lt;br/&gt;Palaa takaisin ja tarkista käyttäjätunnus ja salasana.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Etäkansion %1 luonti epäonnistui, virhe &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Täsmäysyhteys kansiosta %1 etäkansioon %2 on asetettu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Yhteys kohteeseen %1 muodostettiin onnistuneesti!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Yhteyttä osoitteeseen %1 ei voitu muodostaa. Ole hyvä ja tarkista uudelleen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Kansion nimen muuttaminen epäonnistui</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Paikallinen synkronointikansio %1 luotu onnistuneesti!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1391,7 +1391,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Yhteys aikakatkaistiin</translation>
    </message>
@@ -1399,7 +1399,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1435,22 +1435,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Tiedostoa ei voitu ladata täysin.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1481,7 +1481,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>kansion %1 luominen epäonnistui</translation>
    </message>
@@ -1507,7 +1507,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
@@ -1578,38 +1578,43 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Tiedosto poistettu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2429,21 +2434,35 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Versio %1. Lisätietoja osoitteessa &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Tekijänoikeus ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2837,27 +2856,27 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 t</translation>
    </message>
@@ -2878,7 +2897,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>Le fichier de destination a une erreur de taille ou de date de modification</translation>
    </message>
@@ -713,22 +713,22 @@ Voulez-vous réellement effectuer cette opération ?</translation>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Le serveur a retourné une gamme de contenu erronée</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Délai d&apos;attente de connexion dépassé</translation>
    </message>
@@ -849,7 +849,7 @@ Les motifs cochés seront également supprimés s&apos;ils empêchent la suppres
    <message>
        <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
        <source>Edit ignore pattern:</source>
-        <translation>Éditer le motif :</translation>
+        <translation>Modifier le motif :</translation>
    </message>
    <message>
        <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
@@ -1145,7 +1145,7 @@ L&apos;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 nouveaux paramètres, les configuration de dossiers actuelles 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"/>
@@ -1250,114 +1250,114 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>La requête d&apos;authentification vers le serveur a été redirigée vers &apos;%1&apos;. L&apos;URL est erronée, le serveur est mal configuré.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Une réponse non valide a été reçue à une requête WebDav authentifiée.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Accès refusé par le serveur. Pour vérifier que vous avez accès, &lt;a href=&quot;%1&quot;&gt;cliquez ici&lt;/a&gt; pour accéder au service avec votre navigateur.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Le dossier de synchronisation local %1 existe déjà, configuration de la synchronisation.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Création du dossier local de synchronisation %1... </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>échoué.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Impossible de créer le répertoire local %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Aucun dossier distant spécifié !</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Erreur : %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>création d&apos;un répertoire sur ownCloud : %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Le dossier distant %1 a été créé avec succès.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Le dossier distant %1 existe déjà. Connexion.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>La création du dossier a généré le code d&apos;erreur HTTP %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>La création du répertoire distant a échoué car les informations d&apos;identification sont erronées !&lt;br/&gt;Veuillez revenir en arrière et les vérifier.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;La création du dossier distant a échoué, probablement parce que les informations d&apos;identification fournies sont fausses.&lt;/font&gt;&lt;br/&gt;Veuillez revenir en arrière et les vérifier.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>La création du dossier distant &quot;%1&quot; a échouée avec l&apos;erreur &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Une synchronisation entre le dossier local %1 et le dossier distant %2 a été configurée.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Connecté avec succès à %1 !</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>La connexion à %1 n&apos;a pu être établie. Veuillez réessayer.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Echec du renommage du dossier</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Impossible de supprimer et de sauvegarder le dossier parce que ce dossier ou un de ses fichiers est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et ré-essayer, ou annuler l&apos;installation.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Dossier de synchronisation local %1 créé avec succès !&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1396,7 +1396,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Délai d&apos;attente de connexion dépassé</translation>
    </message>
@@ -1404,7 +1404,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>L&apos;URL interrogéé a renvoyé une réponse json non valide</translation>
    </message>
@@ -1440,22 +1440,22 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Le fichier %1 ne peut pas être téléchargé en raison d&apos;un conflit sur le nom de fichier local. </translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Le fichier n&apos;a pas pu être téléchargé intégralement.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Le fichier %1 n&apos;a pas pu être sauvegardé en raison d&apos;un conflit sur le nom du fichier local !</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>Le fichier a changé depuis sa découverte</translation>
    </message>
@@ -1486,7 +1486,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
        <translation>Attention, collision possible avec %1 à cause de la casse</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>impossible de créer le répertoire %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Le fichier %1 ne peut pas être renommé en %2 à cause d&apos;un conflit local de nom de fichier</translation>
    </message>
@@ -1583,38 +1583,43 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Fichier supprimé</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Fichier local modifié pendant la synchronisation. Elle va reprendre. </translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Fichier local modifié pendant la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <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="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de conflit.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>URL de sondage manquante</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Fichier local supprimé pendant la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Le serveur n&apos;a pas acquitté le dernier morceau (aucun e-tag n&apos;était présent).</translation>
    </message>
@@ -1684,7 +1689,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
    <message>
        <location filename="../src/gui/protocolwidget.cpp" line="256"/>
        <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source>
-        <translation>Actuellement aucun fichier n&apos;a été ignoré en raison d&apos;erreurs précédentes, et aucun téléchargement n&apos;est en cours.</translation>
+        <translation>Actuellement, aucun fichier n&apos;a été ignoré en raison des erreurs précédentes et aucun téléchargement n&apos;est en cours.</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/protocolwidget.cpp" line="259"/>
@@ -2440,21 +2445,35 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Version %1. Pour plus d&apos;information, visitez &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Distribué par %1 et sous licence GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 et le logo %2  sont des marques enregistrées de %1 aux Etats-Unis, dans d&apos;autres pays, ou les deux.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>L&apos;entête de somme de contrôle est mal formée.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>Le fichier téléchargé ne correspond pas à la somme de contrôle, il va être téléchargé à nouveau.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2848,27 +2867,27 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 Tio</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 Gio</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 Mio</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 Kio</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 octets</translation>
    </message>
@@ -2889,7 +2908,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Construit à partir de la révision Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; du %3, %4 en utilisant Qt %5, %6.&lt;/small&gt;&lt;p&gt;</translation>
    </message>
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>O ficheiro de destino ten un tamaño ou unha hora de modificación non agardados</translation>
    </message>
@@ -713,22 +713,22 @@ Confirma que quere realizar esta operación?</translation>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>O servidor devolveu un intervalo de contidos estragado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Esgotouse o tempo de conexión</translation>
    </message>
@@ -1250,114 +1250,114 @@ Recomendámoslle que non o use.</translation>
        <translation>A solicitude autenticada no servidor foi redirixida a «%1», O URL é incorrecto, o servidor está mal configurado.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Deuse unha resposta incorrecta a unha solicitude de WebDAV autenticada</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Acceso prohibido polo servidor. Para comprobar que dispón do acceso axeitado, &lt;a href=&quot;%1&quot;&gt;prema aquí&lt;/a&gt; para acceder ao servizo co seu navegador.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>O cartafol de sincronización local %1 xa existe. Configurándoo para a sincronización.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Creando un cartafol local de sincronización %1...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>aceptar</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>fallou.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Non foi posíbel crear o cartafol local %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Non foi especificado o cartafol remoto!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Erro: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>creando o cartafol en ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>O cartafol remoto %1 creouse correctamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>O cartafol remoto %1 xa existe. Conectándoo para a sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>A creación do cartafol resultou nun código de erro HTTP %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>A creación do cartafol remoto fracasou por por de seren incorrectas as credenciais!&lt;br/&gt;Volva atrás e comprobe as súas credenciais.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;A creación do cartafol remoto fallou probabelmente debido a que as credenciais que se deron non foran as correctas.&lt;/font&gt;&lt;br/&gt;Volva atrás e comprobe as súas credenciais.&lt;/p&gt; </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Produciuse un fallo ao crear o cartafol remoto %1 e dou o erro &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Estabeleceuse a conexión de sincronización de %1 ao directorio remoto %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Conectou satisfactoriamente con %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Non foi posíbel estabelecer a conexión con %1. Compróbeo de novo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Non foi posíbel renomear o cartafol</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
-        <translation>Non é posíbel retirar e facer copia de seguranza do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e ténteo de novo, ou cancele a acción.</translation>
+        <translation>Non é posíbel retirar e facer unha copia de seguranza do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e ténteo de novo, ou cancele a acción.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;O cartafol local de sincronización %1 creouse correctamente!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1396,7 +1396,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Esgotouse o tempo de conexión</translation>
    </message>
@@ -1404,7 +1404,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>O URL requirido devolveu unha resposta JSON incorrecta</translation>
    </message>
@@ -1440,22 +1440,22 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Non foi posíbel descargar completamente o ficheiro.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>O ficheiro cambiou após seren atopado</translation>
    </message>
@@ -1486,7 +1486,7 @@ Recomendámoslle que non o use.</translation>
        <translation>Atención, posíbel colisión entre maiúsculas e minúsculas con %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>non foi posíbel crear o directorio %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Non é posíbel renomear o ficheiro %1 como %2 por mor dunha colisión co nome dun ficheiro local</translation>
    </message>
@@ -1583,38 +1583,43 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Ficheiro retirado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>O ficheiro local cambiou durante a sincronización. Retomase.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>O ficheiro local cambiou durante a sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzando a interrupción do traballo na conexión HTTP reiniciandoa con Qt &lt;5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>Non se atopa o URL requirido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>O ficheiro local retirarase durante a sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presente)</translation>
    </message>
@@ -2437,21 +2442,35 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Versión %1. Para obter máis información visite &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Distribuído por %1 e licenciado baixo a Licenza Pública Xeral (GPL) GNU Versión 2.0.&lt;br/&gt;Os logotipos %2 e %2 son marcas rexistradas de %1 nos Estados Unidos de Norte América e/ou outros países.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>A cabeceira da suma de comprobación é incorrecta.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>O ficheiro descargado non coincide coa suma de comprobación. Retomase.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2845,27 +2864,27 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2886,7 +2905,7 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Construído a partir de la revisión Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; en %3, %4 usando Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -710,22 +710,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation type="unfinished"/>
    </message>
@@ -1243,114 +1243,114 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>A helyi %1 mappa már létezik, állítsa be a szinkronizálódását.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>  sikertelen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Hiba: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>%1 távoli nappa sikeresen létrehozva.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>A %1 távoli mappa már létezik. Csatlakoztassa a szinkronizációhoz.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>A könyvtár létrehozásakor keletkezett HTTP hibakód %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;A távoli mappa létrehozása sikertelen, valószínűleg mivel hibásak a megdott hitelesítési adatok.&lt;/font&gt;&lt;br/&gt;Lépjen vissza és ellenőrizze a belépési adatokat.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>A távoli %1 mappa létrehozása nem sikerült. Hibaüzenet: &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>A szinkronizációs kapcsolat a %1 és a %2 távoli mappa között létrejött.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Sikeresen csatlakozva: %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>A kapcsolat a %1 kiszolgálóhoz sikertelen. Ellenőrizze újra.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>A mappa átnevezése nem sikerült</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Helyi %1 szinkronizációs mappa sikeresen létrehozva!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1389,7 +1389,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation type="unfinished"/>
    </message>
@@ -1397,7 +1397,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1433,22 +1433,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1479,7 +1479,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation type="unfinished"/>
    </message>
@@ -1505,7 +1505,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
@@ -1576,38 +1576,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2425,21 +2430,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2833,27 +2852,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2874,7 +2893,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>Il file di destinazione ha una dimensione o un&apos;ora di modifica inattesa</translation>
    </message>
@@ -713,22 +713,22 @@ Sei sicuro di voler eseguire questa operazione?</translation>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Il server ha restituito un content-range errato</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Connessione scaduta</translation>
    </message>
@@ -1249,114 +1249,114 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>La richiesta autenticata al server è stata rediretta a &apos;%1&apos;. L&apos;URL è errato, il server non è configurato correttamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Ricevuta una risposta non valida a una richiesta webdav autenticata.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Accesso negato dal server. Per verificare di avere i permessi appropriati, &lt;a href=&quot;%1&quot;&gt;fai clic qui&lt;/a&gt; per accedere al servizio con il tuo browser.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>La cartella di sincronizzazione locale %1 esiste già, impostata per la sincronizzazione.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Creazione della cartella locale di sincronizzazione %1... </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>non riuscita.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Impossibile creare la cartella locale %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Nessuna cartella remota specificata!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Errore: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>creazione cartella su ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>La cartella remota %1 è stata creata correttamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>La cartella remota %1 esiste già. Connessione in corso per la sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>La creazione della cartella ha restituito un codice di errore HTTP %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>La creazione della cartella remota non è riuscita poiché le credenziali fornite sono errate!&lt;br/&gt;Torna indietro e verifica le credenziali.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;La creazione della cartella remota non è riuscita probabilmente perché le credenziali fornite non sono corrette.&lt;/font&gt;&lt;br/&gt;Torna indietro e controlla le credenziali inserite.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Creazione della cartella remota %1 non riuscita con errore &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Una connessione di sincronizzazione da %1 alla cartella remota %2 è stata stabilita.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Connesso con successo a %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>La connessione a %1 non può essere stabilita. Prova ancora.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Rinomina della cartella non riuscita</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperta in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Cartella locale %1 creata correttamente!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1395,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Connessione scaduta</translation>
    </message>
@@ -1403,7 +1403,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Risposta JSON non valida dall&apos;URL di richiesta</translation>
    </message>
@@ -1439,22 +1439,22 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Il file non può essere scaricato completamente.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>Il file è stato modificato dal suo rilevamento</translation>
    </message>
@@ -1485,7 +1485,7 @@ Non è consigliabile utilizzarlo.</translation>
        <translation>Attenzione, possibile conflitto relativo all&apos;uso di maiuscole e minuscole con %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>impossibile creare la cartella %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Il file %1 non può essere rinominato in %2 a causa di un conflitto con il nome di un file locale</translation>
    </message>
@@ -1582,38 +1582,43 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>File rimosso</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Un file locale è cambiato durante la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forzare l&apos;interruzione dell&apos;operazione in caso di ripristino della connessione HTTP con Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>URL di richiesta mancante</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Il server non ha riconosciuto l&apos;ultimo pezzo. (Non era presente alcun e-tag)</translation>
    </message>
@@ -2437,21 +2442,35 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Versione %1. Per ulteriori informazioni vedi &lt;a href=&quot;%2&quot;&gt;3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Distribuito da %1 e sotto licenza GNU General Public License (GPL) versione 2.0.&lt;br/&gt;%2 e il logo di %2 sono marchi registrati di %1 negli Stati Uniti, in altri paesi o entrambi.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>L&apos;intestazione del codice di controllo è malformata.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>Il file scaricato non verifica il codice di controllo, sarà ripristinato.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2845,27 +2864,27 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2886,7 +2905,7 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Compilato dalla revisione Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; il %3, %4 utilizzando Qt %5, %6&lt;/small&gt;&lt;p&gt;</translation>
    </message>
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -713,22 +713,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>サーバーが間違ったcontent-rangeを返しました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>接続タイムアウト</translation>
    </message>
@@ -1248,114 +1248,114 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>サーバーによってアクセスが拒否されています。適切なアクセス権があるか検証するには、&lt;a href=&quot;%1&quot;&gt;ここをクリック&lt;/a&gt;してブラウザーでサービスにアクセスしてください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>ローカルの同期フォルダー %1 はすでに存在するため、同期の設定をしてください。&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>OK</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>失敗。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>ローカルフォルダー %1 を作成できませんでした</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>リモートフォルダーが指定されていません！</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>エラー: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>ownCloud上にフォルダーを作成中: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>リモートフォルダー %1 は正常に生成されました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>リモートフォルダー %1 はすでに存在します。同期のために接続しています。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>フォルダーの作成はHTTPのエラーコード %1 で終了しました</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>指定された資格情報が間違っているため、リモートフォルダーの作成に失敗しました！&lt;br/&gt;前に戻って資格情報を確認してください。&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;おそらく資格情報が間違っているため、リモートフォルダーの作成に失敗しました。&lt;/font&gt;&lt;br/&gt;前に戻り、資格情報をチェックしてください。&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>リモートフォルダー %1 の作成がエラーで失敗しました。&lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>%1 からリモートディレクトリ %2 への同期接続を設定しました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>%1への接続に成功しました！</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>%1 への接続を確立できませんでした。もう一度確認してください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>フォルダー名の変更に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>フォルダーまたはその中にあるファイルが他のプログラムで開かれているため、フォルダーの削除やバックアップができません。フォルダーまたはファイルを閉じてから再試行するか、セットアップをキャンセルしてください。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;ローカルの同期フォルダー %1 は正常に作成されました！&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1394,7 +1394,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>接続タイムアウト</translation>
    </message>
@@ -1402,7 +1402,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>不正なJSONがポーリングURLから返りました</translation>
    </message>
@@ -1438,22 +1438,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>このファイルのダウンロードは完了しませんでした</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>%1 はローカルファイル名が衝突しているため保存できません！</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1484,7 +1484,7 @@ It is not advisable to use it.</source>
        <translation>注意: %1 で大文字小文字が競合している可能性</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>ディレクトリ %1 を作成できませんでした</translation>
    </message>
@@ -1510,7 +1510,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません</translation>
    </message>
@@ -1581,38 +1581,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>ファイルを削除しました</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>ローカルのファイルが同期中に変更されました。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>ポーリングURLがありません</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>ローカルファイルを同期中に削除します。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>サーバーは最終チャンクを認識しません。(e-tag が存在しません)</translation>
    </message>
@@ -2434,21 +2439,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;バージョン %1. 詳細な情報は&lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;を確認してください。&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;%1 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。&lt;br/&gt;%2 及び %2 のロゴはアメリカ合衆国またはその他の国、あるいはその両方における %1 の登録商標です。&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2842,27 +2861,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2883,7 +2902,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>Het doelbestand heeft een onverwachte omvang of tijdstempel</translation>
    </message>
@@ -713,22 +713,22 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Server retourneerde verkeerde content-bandbreedte</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Verbindingstime-out</translation>
    </message>
@@ -1250,114 +1250,114 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>De geauthentiseerde aanvraag voor de server werd omgeleid naar &apos;%1&apos;. De URL is onjuist, de server is verkeerd geconfigureerd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Er was een ongeldig antwoord op een geauthenticeerde webdav opvraging</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Toegang door server verboden. Om te verifiëren dat u toegang mag hebben, &lt;a href=&quot;%1&quot;&gt;klik hier&lt;/a&gt; om met uw browser toegang tot de service te krijgen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Lokale synch map %1 bestaat al, deze wordt ingesteld voor synchronisatie.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Creëren lokale sync map %1...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>mislukt.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Kon lokale map %1 niet aanmaken</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Geen externe map opgegeven!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Fout: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>aanmaken map op ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Externe map %1 succesvol gecreërd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>De remote map %1 bestaat al. Verbinden voor synchroniseren.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Het aanmaken van de map resulteerde in HTTP foutcode %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.&lt;br/&gt;Ga terug en controleer uw inloggegevens.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.&lt;/font&gt;&lt;br/&gt;ga terug en controleer uw inloggevens.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Aanmaken van remote map %1 mislukt met fout &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Er is een sync verbinding van %1 naar remote directory %2 opgezet.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Succesvol verbonden met %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Verbinding met %1 niet geslaagd. Probeer het nog eens.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Hernoemen map mislukt</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Kan de map niet verwijderen en backuppen, omdat de map of een bestand daarin, geopend is in een ander programma. Sluit de map of het bestand en drup op Opnieuw of annuleer de installatie.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Lokale synch map %1 is succesvol aangemaakt!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1396,7 +1396,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Verbindingstime-out</translation>
    </message>
@@ -1404,7 +1404,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Ongeldig JSON antwoord van de peilingen URL</translation>
    </message>
@@ -1440,22 +1440,22 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Bestand %1 kan niet worden gedownload omdat de naam conflicteert met een lokaal bestand</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Het bestand kon niet volledig worden gedownload.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>Het bestand is gewijzigd sinds het is gevonden</translation>
    </message>
@@ -1486,7 +1486,7 @@ We adviseren deze site niet te gebruiken.</translation>
        <translation>Let op, mogelijk conflict hoofdlettergevoeligheid met 1%</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>kon map %1 niet maken</translation>
    </message>
@@ -1512,7 +1512,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand</translation>
    </message>
@@ -1583,38 +1583,43 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Bestand verwijderd</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Lokaal bestand gewijzigd bij sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forceren job-beëindiging op HTTP verbindingsreset met Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>URL peiling ontbreekt</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
    </message>
@@ -2438,21 +2443,35 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Versie %1. Voor meer informatie bezoek &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Gedistribueer door %1 en gelicenseerd onder de GNU General Public License (GPL) Versie 2.0.&lt;br/&gt;%2 en het %2 logo zijn geregistreerde handelsmerken van %1 in de Verenigde Staten, in andere landen of beide.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>De kop van het controlegetal is misvormd.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>Het gedownloade bestand komt niet overeen met het controlegetal. Het wordt opnieuw verwerkt.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2846,27 +2865,27 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2887,7 +2906,7 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Gebouwd van Git revisie &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; op %3, %4 gebruik makend van Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
@@ -2907,7 +2926,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/libsync/progressdispatcher.cpp" line="36"/>
        <source>Downloaded, renamed conflicting file</source>
-        <translation>Gedownloaded, conflicterend bestand hernoemd</translation>
+        <translation>Gedownload, conflicterend bestand hernoemd</translation>
    </message>
    <message>
        <location filename="../src/libsync/progressdispatcher.cpp" line="38"/>
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -2,9 +2,9 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
-        <translation type="unfinished"/>
+        <translation>Plik docelowy ma nieznaną wielkość lub datę modyfikacji</translation>
    </message>
 </context>
 <context>
@@ -242,12 +242,12 @@ Pozostało czasu %5</translation>
    <message>
        <location filename="../src/gui/addcertificatedialog.ui" line="17"/>
        <source>SSL client certificate authentication</source>
-        <translation type="unfinished"/>
+        <translation>Autentykacja certyfikatem SSL klienta</translation>
    </message>
    <message>
        <location filename="../src/gui/addcertificatedialog.ui" line="23"/>
        <source>This server probably requires a SSL client certificate.</source>
-        <translation type="unfinished"/>
+        <translation>Ten serwer prawdopodobnie wymaga certyfikatu SSL klienta</translation>
    </message>
    <message>
        <location filename="../src/gui/addcertificatedialog.ui" line="35"/>
@@ -318,7 +318,7 @@ Pozostało czasu %5</translation>
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="144"/>
        <source>Authentication error: Either username or password are wrong.</source>
-        <translation type="unfinished"/>
+        <translation>Błąd autentykacji: nazwa użytkownika lub hasło są nieprawidłowe.</translation>
    </message>
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="146"/>
@@ -661,7 +661,7 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="309"/>
        <source>Authentication failed accessing %1</source>
-        <translation type="unfinished"/>
+        <translation>Błąd autentykacji w dostępie do %1</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="311"/>
@@ -702,33 +702,33 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</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;Ostrzeżenie:&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;Ostrzeżenie:&lt;/b&gt;</translation>
    </message>
 </context>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Serwer zwrócił błędną zakres zawartości</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Limit czasu połączenia</translation>
    </message>
@@ -867,7 +867,7 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="71"/>
        <source>&amp;Search:</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Szukaj:</translation>
    </message>
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="79"/>
@@ -907,7 +907,7 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="194"/>
        <source>Could not write to log file %1</source>
-        <translation type="unfinished"/>
+        <translation>Błąd zapisu pliku logu %1</translation>
    </message>
 </context>
 <context>
@@ -1065,13 +1065,14 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="56"/>
        <source>New %1 Update Ready</source>
-        <translation type="unfinished"/>
+        <translation>Nowe %1 uaktualnienie jest gotowe</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="57"/>
        <source>A new update for %1 is about to be installed. The updater may ask
 for additional privileges during the process.</source>
-        <translation type="unfinished"/>
+        <translation>Nowe ualtualnienie dla %1 jest gotowe do instalacji. Aktualizator może zapytać
+o dodatkowe uprawnienia podczas procesu aktualizacji.</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="78"/>
@@ -1139,7 +1140,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/>
        <source>Sync the directory &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Synchronizacja katalogu &apos;%1&apos;</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
@@ -1236,7 +1237,7 @@ Niezalecane jest jego użycie.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="200"/>
        <source>Timeout while trying to connect to %1 at %2.</source>
-        <translation type="unfinished"/>
+        <translation>Upłynął czas podczas próby połączenia do %1 na %2.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="211"/>
@@ -1249,114 +1250,114 @@ Niezalecane jest jego użycie.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Lokalny folder synchronizacji %1 już istnieje. Ustawiam go do synchronizacji.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>OK</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>Błąd.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Nie udało się utworzyć lokalnego folderu %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Nie określono folderu zdalnego!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Błąd: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>tworzę folder na ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Zdalny folder %1 został utworzony pomyślnie.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Zdalny folder %1 już istnieje. Podłączam go do synchronizowania.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Tworzenie folderu spowodowało kod błędu HTTP %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Nie udało się utworzyć zdalnego folderu ponieważ podane dane dostępowe są nieprawidłowe!&lt;br/&gt;Wróć i sprawdź podane dane dostępowe.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Tworzenie folderu zdalnego nie powiodło się. Prawdopodobnie dostarczone poświadczenia są błędne.&lt;/font&gt;&lt;br/&gt;Wróć i sprawdź poświadczenia.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Tworzenie folderu zdalnego %1 nie powiodło się z powodu błędu &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Połączenie synchronizacji z %1 do katalogu zdalnego %2 zostało utworzone.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Udane połączenie z %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Połączenie z %1 nie może być nawiązane. Sprawdź ponownie.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Zmiana nazwy folderu nie powiodła się</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Nie można usunąć i zarchiwizować folderu ponieważ znajdujący się w nim plik lub folder jest otwarty przez inny program. Proszę zamknąć folder lub plik albo kliknąć ponów lub anuluj setup.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Utworzenie lokalnego folderu synchronizowanego %1 zakończone pomyślnie!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1396,7 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Limit czasu połączenia</translation>
    </message>
@@ -1403,7 +1404,7 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1439,22 +1440,22 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1485,7 +1486,7 @@ Niezalecane jest jego użycie.</translation>
        <translation>Uwaga, możliwa niezgodność związana z wielością liter w %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>nie można utworzyć katalogu %1</translation>
    </message>
@@ -1511,7 +1512,7 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Plik %1 nie może być nazwany %2 z powodu kolizji z lokalną nazwą pliku</translation>
    </message>
@@ -1582,38 +1583,43 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Usunięto plik</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation>
    </message>
@@ -2433,21 +2439,35 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2842,27 +2862,27 @@ Kliknij</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2883,7 +2903,7 @@ Kliknij</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>O ficheiro destino tem um tamanho ou hora de modificação inesperado</translation>
    </message>
@@ -712,22 +712,22 @@ Se você, ou o seu administrador, reiniciou  a sua conta no servidor, escolha &q
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Nenhum E-Tag recebido do servidor, verifique Proxy / gateway</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Recebemos um e-Tag diferente para resumir. Tentando uma próxima vez.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>O servidor retornou o alcance-conteúdo errado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>O tempo de ligação expirou</translation>
    </message>
@@ -1248,114 +1248,114 @@ It is not advisable to use it.</source>
        <translation>O pedido de autenticação ao servidor foi redirecionado para &apos;%1&apos;. O URL é mau, o servidor está mal configurado. </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Houve uma resposta inválida ao pedido de autenticação webdav</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Acesso proibido pelo servidor. Para verificar que tem acesso, &lt;a href=&quot;%1&quot;&gt;clique aqui&lt;/a&gt; para aceder ao serviço com o seu navegador.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>A pasta de sincronização locl %1 já existe, a configurar para sincronizar.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>A criar a pasta de sincronização local %1...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>Falhou.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Não foi possível criar a pasta local %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Não foi indicada a pasta remota!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Erro: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>a criar a pasta na ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Criação da pasta remota %1 com sucesso!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>A pasta remota %1 já existe. Ligue-a para sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>A criação da pasta resultou num erro HTTP com o código %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.&lt;br/&gt;Por favor, verifique as suas credenciais.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.&lt;/font&gt;&lt;br/&gt;Por favor, verifique as suas credenciais.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>A criação da pasta remota %1 falhou com o erro &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>A sincronização de %1 com a pasta remota %2 foi criada com sucesso.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Conectado com sucesso a %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Não foi possível ligar a %1 . Por Favor verifique novamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Erro ao renomear a pasta</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Não é possível remover e fazer backup à pasta porque a pasta ou um ficheiro nesta está aberto em outro programa. Por favor, feche a pasta ou o ficheiro e clique novamente ou cancele a configuração.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Pasta de sincronização local %1 criada com sucesso!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1394,7 +1394,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>O tempo de ligação expirou</translation>
    </message>
@@ -1402,7 +1402,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Resposta JSON inválida do URL poll</translation>
    </message>
@@ -1438,22 +1438,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Não foi possível transferir o ficheiro na totalidade.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>O ficheiro alterou-se desde a sua descoberta</translation>
    </message>
@@ -1484,7 +1484,7 @@ It is not advisable to use it.</source>
        <translation>Atenção, possível sensibilidade a maiúsculas em conflito com %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>Não foi possível criar a directoria %1</translation>
    </message>
@@ -1510,7 +1510,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>O ficheiro %1 nao pode ser renomeado para %2 devido a conflito com nome de ficheiro local</translation>
    </message>
@@ -1581,38 +1581,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Ficheiro Eliminado</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Ficheiro local alterado durante a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>A forçar aborto no trabalho de redefinição de conexão HTTP com Qt &lt; 5.4.3</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>O ficheiro foi editado localmente mas faz parte de uma prtilha só de leitura. Foi restaurado mas a edição está no ficheiro de conflito.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>URL poll em falta</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>O arquivo local foi removido durante a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation>
    </message>
@@ -2436,21 +2441,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Versão %1. Para mais informações visite &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, Incorporado&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Distribuído por %1 e licenciado sob a GNU General Public License (GPL) Versão 2.0.&lt;br/&gt;%2 e o logótipo %2 são marcas registadas da %1 nos Estados Unidos, outros países, ou ambos &lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2844,27 +2863,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2885,7 +2904,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Construído a partir da revisão Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; em %3, %4 usando Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>O arquivo de destino tem um tamanho ou tempo de modificação inesperado</translation>
    </message>
@@ -713,22 +713,22 @@ Você tem certeza que quer executar esta operação?</translation>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>O servidor retornou erro numa série-de-conteúdo</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Conexão Finalizada</translation>
    </message>
@@ -1249,114 +1249,114 @@ It is not advisable to use it.</source>
        <translation>A solicitação de autenticação ao servidor foi direcionada para &apos;%1&apos;. A URL está errada, a configuração do servidor está errada.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Houve uma resposta inválida a um pedido de autenticação WebDAV</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Acesso proibido pelo servidor. Para verificar se você tem acesso adequado, &lt;a href=&quot;%1&quot;&gt;clique aqui&lt;/a&gt; para acessar o serviço com o seu navegador.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Pasta local de sincronização %1 já existe, configurando para sincronização. &lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Criação de pasta de sincronização local %1...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>falhou.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Não foi possível criar pasta local %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Nenhuma pasta remota foi especificada!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Erro: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>criar pasta no ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Pasta remota %1 criada com sucesso.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Pasta remota %1 já existe. Conectando para sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>A criação da pasta resultou em um erro do código HTTP %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>A criação da pasta remota falhou porque as credenciais fornecidas estão erradas!&lt;br/&gt;Por favor, volte e verifique suas credenciais.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;A criação remota de pasta falhou provavelmente as causas da falha na criação da pasta remota são credenciais erradas&lt;/font&gt;&lt;br/&gt;Volte e verifique suas credenciais, por favor.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Falha na criação da pasta remota %1 com erro &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Uma conexão de sincronização de %1 para o diretório remoto %2 foi realizada.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Conectado com sucesso a %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Conexão à %1 não foi estabelecida. Por favor, verifique novamente.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Falha no nome da pasta</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo que está nesta pasta está aberto em outro programa. Por favor, feche a pasta ou arquivo e clique tentar novamente ou cancelar a operação.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Pasta de sincronização local %1 criada com sucesso!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1395,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Conexão Finalizada</translation>
    </message>
@@ -1403,7 +1403,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Resposta JSON inválida a partir do conjunto de URL</translation>
    </message>
@@ -1439,22 +1439,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>O arquivo %1 não pode ser baixado por causa de um confronto local no nome do arquivo!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>O arquivo não pode ser baixado completamente.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>Arquivo foi alterado desde a descoberta</translation>
    </message>
@@ -1485,7 +1485,7 @@ It is not advisable to use it.</source>
        <translation>Atenção, possível caso de sensibilidade de minúscula/maiúscula, choque com 1%</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>Não foi possível criar diretório %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>O arquivo %1 não pode ser renomeado para %2 por causa de um choque com nome de arquivo local</translation>
    </message>
@@ -1582,38 +1582,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Arquivo Removido</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Arquivo local alterado durante a sincronização. Ele será retomado.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Arquivo local modificado durante a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Forçando cancelamento do trabalho em redefinição de conexão HTTP com o Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>Faltando conjunto de URL</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>O arquivo local foi removido durante a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation>
    </message>
@@ -2436,21 +2441,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Versão %1. Para mais informações por favor visite &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Distribuído por %1 e licenciado sobre a GNU General Public License (GPL) Versão 2.0.&lt;br/&gt;%2 e o %2 logo são marcas registradas de %1 nos Estados Unidos, outros países ou ambos.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>O cabeçalho de checksum está incorreto.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>O arquivo baixado não coincide com o checksum, ele será retomado.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2844,27 +2863,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2885,7 +2904,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Construído a partir de revisão Git &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; em %3, %4 usando Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -104,7 +104,7 @@
    <message>
        <location filename="../src/gui/accountsettings.ui" line="104"/>
        <source>Storage Usage</source>
-        <translation>Использование хранилища</translation>
+        <translation>Использование доступного пространства</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="126"/>
@@ -713,22 +713,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>E-Tag от сервера не получен, проверьте настройки прокси/шлюза.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Сервер вернул неверный диапазон содержимого</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Время ожидания подключения истекло</translation>
    </message>
@@ -1112,7 +1112,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="94"/>
        <source>No updates available. Your installation is at the latest version.</source>
-        <translation>Обновлений нет. Установлена последняя версия.</translation>
+        <translation>Обновлений в настоящий момент нет. У вас установлена самая последняя версия программы.</translation>
    </message>
 </context>
 <context>
@@ -1250,114 +1250,114 @@ It is not advisable to use it.</source>
        <translation>Запрос авторизации с сервера перенаправлен на  &apos;%1&apos;. Ссылка не верна, сервер не настроен.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Обнаружен не верный ответ на авторизованный запрос WebDAV</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Доступ запрещён сервером. Чтобы доказать, что у Вас есть права доступа, &lt;a href=&quot;%1&quot;&gt;нажмите здесь&lt;/a&gt; для входа через Ваш браузер.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Локальный каталог синхронизации %1 уже существует, используем его для синхронизации.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Создание локальной папки синхронизации %1... </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ок</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>не удалось.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Не удалось создать локальный каталог синхронизации %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Не указан удалённый каталог!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Ошибка: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>создание каталога на ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Удалённый каталог %1 успешно создан.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Удалённый каталог %1 уже существует. Подключение к нему для синхронизации.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Создание каталога завершилось с HTTP-ошибкой %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Не удалось создать удаленный каталог, так как представленные параметры доступа неверны!&lt;br/&gt;Пожалуйста, вернитесь назад и проверьте учетные данные.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Не удалось создать удаленный каталог, возможно, указанные учетные данные неверны.&lt;/font&gt;&lt;br/&gt;Вернитесь назад и проверьте учетные данные.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Удаленный каталог %1 не создан из-за ошибки &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Установлено соединение синхронизации %1 к удалённому каталогу %2.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Соединение с  %1 установлено успешно!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Не удалось соединиться с %1. Попробуйте снова.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Ошибка переименования каталога</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Невозможно удалить каталог и создать его резервную копию, каталог или файл в ней открыт в другой программе. Закройте каталог или файл и нажмите &quot;Повторить попытку&quot;, либо прервите мастер настройки.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Локальный каталог синхронизации %1 успешно создан!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1396,7 +1396,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Время ожидания подключения истекло</translation>
    </message>
@@ -1404,7 +1404,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Не правильный JSON ответ на сформированный URL</translation>
    </message>
@@ -1440,22 +1440,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Файл %1 не может быть загружен из-за локального конфликта имен!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Невозможно полностью загрузить файл.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1486,7 +1486,7 @@ It is not advisable to use it.</source>
        <translation>Внимание, возможен конфликт чувствительности к регистру с %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>не удалось создать каталог %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Файл %1 не может быть переименован в %2 из-за локального конфликта имен</translation>
    </message>
@@ -1583,38 +1583,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Файл Перемещён</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Локальный файл изменился в процессе синхронизации.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Измененный файл принадлежит удаленному общему ресурсу только для чтения. Файл был восстановлен, ваши правки доступны в файле конфликтов.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>Не хватает сформированного URL</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Локальный файл был удалён в процессе синхронизации.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation>
    </message>
@@ -1774,7 +1779,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/settingsdialog.cpp" line="76"/>
        <source>Account</source>
-        <translation>Учётная запись</translation>
+        <translation>Уч.запись</translation>
    </message>
    <message>
        <location filename="../src/gui/settingsdialog.cpp" line="81"/>
@@ -2010,7 +2015,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="102"/>
        <source>&lt;h3&gt;Certificate Details&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Детали сертификата&lt;/h3&gt;</translation>
+        <translation>&lt;h3&gt;Данные сертификата:&lt;/h3&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="105"/>
@@ -2050,7 +2055,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="115"/>
        <source>&lt;h3&gt;Issuer&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Издатель&lt;/h3&gt;</translation>
+        <translation>&lt;h3&gt;Выдан:&lt;/h3&gt;</translation>
    </message>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="118"/>
@@ -2112,7 +2117,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="217"/>
        <source>Certificate information:</source>
-        <translation>Информация сертификата:</translation>
+        <translation>Информация о TLS-сертификатах:</translation>
    </message>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="195"/>
@@ -2442,21 +2447,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Версия %1. Для получения дополнительной информации посетите &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Права принадлежат ownCloud, Incorporated&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Все права принадлежат ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Распространяется %1 и лицензировано под GNU General Public License (GPL) Версии 2.0.&lt;br/&gt;Логотипы %2 и %2 являются зарегистрированной торговой маркой %1 в США и/или других странах.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2850,27 +2869,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 ТиБ</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 ГиБ</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 МиБ</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 КиБ</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 Б</translation>
    </message>
@@ -2891,7 +2910,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Собрано исходников Git версии &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; на %3, %4 используя Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -2,9 +2,9 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
-        <translation type="unfinished"/>
+        <translation>Cieľový súbor má neočakávanú veľkosť alebo čas zmeny</translation>
    </message>
 </context>
 <context>
@@ -73,7 +73,7 @@
    <message>
        <location filename="../src/gui/accountsettings.ui" line="20"/>
        <source>Account to Synchronize</source>
-        <translation>Účet na synchronizáciu</translation>
+        <translation>Účet pre synchronizáciu</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="41"/>
@@ -661,7 +661,7 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="309"/>
        <source>Authentication failed accessing %1</source>
-        <translation type="unfinished"/>
+        <translation>Zlyhalo overenie pri pripojení %1</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="311"/>
@@ -702,33 +702,33 @@ Ste si istý, že chcete uskutočniť danú operáciu?</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;Upozornenie:&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;Upozornenie:&lt;/b&gt; </translation>
    </message>
 </context>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Server vrátil nesprávnu hodnotu Content-range</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Spojenie vypršalo</translation>
    </message>
@@ -867,7 +867,7 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="71"/>
        <source>&amp;Search:</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Hľadať:</translation>
    </message>
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="79"/>
@@ -907,7 +907,7 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="194"/>
        <source>Could not write to log file %1</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno zapísať do záznamového súboru - logu %1</translation>
    </message>
 </context>
 <context>
@@ -1065,13 +1065,14 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="56"/>
        <source>New %1 Update Ready</source>
-        <translation type="unfinished"/>
+        <translation>Pripravená je nová aktualizácia %1</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="57"/>
        <source>A new update for %1 is about to be installed. The updater may ask
 for additional privileges during the process.</source>
-        <translation type="unfinished"/>
+        <translation>Nainštaluje sa nová aktualizácia pre %1. V priebehu aktualizácie
+môžu byť vyžadované dodatočné oprávnenia.</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="78"/>
@@ -1139,7 +1140,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/>
        <source>Sync the directory &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Sychronizovať priečinok &apos;%1&apos;</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
@@ -1249,114 +1250,114 @@ Nie je vhodné ju používať.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Prístup zamietnutý serverom. Po overení správnych prístupových práv, &lt;a href=&quot;%1&quot;&gt;kliknite sem&lt;/a&gt; a otvorte službu v svojom prezerači.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Lokálny synchronizačný priečinok %1 už existuje, prebieha jeho nastavovanie pre synchronizáciu.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
-        <translation type="unfinished"/>
+        <translation>Vytváranie lokálneho synchronizačného priečinka %1 ...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>v poriadku</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>neúspešné.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Nemožno vytvoriť lokálny priečinok %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Vzdialený priečinok nie je nastavený!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Chyba: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>vytváram priečinok v ownCloude: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Vzdialený priečinok %1 bol úspešne vytvorený.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Vzdialený priečinok %1 už existuje. Prebieha jeho pripájanie pre synchronizáciu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Vytváranie priečinka skončilo s HTTP chybovým kódom %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Proces vytvárania vzdialeného priečinka zlyhal, lebo použité prihlasovacie údaje nie sú správne!&lt;br/&gt;Prosím skontrolujte si vaše údaje a skúste to znovu.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Vytvorenie vzdialeného priečinka pravdepodobne zlyhalo kvôli nesprávnym prihlasovacím údajom.&lt;/font&gt;&lt;br/&gt;Prosím choďte späť a skontrolujte ich.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Vytvorenie vzdialeného priečinka %1 zlyhalo s chybou &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Synchronizačné spojenie z %1 do vzdialeného priečinka %2 bolo práve nastavené.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Úspešne pripojené s %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Pripojenie k %1 nemohlo byť iniciované. Prosím skontrolujte to znovu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Premenovanie priečinka zlyhalo</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Nemožno odstrániť a zazálohovať priečinok, pretože priečinok alebo súbor je otvorený v inom programe. Prosím zatvorte priečinok nebo súbor a skúste to znovu alebo zrušte akciu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Lokálny synchronizačný priečinok %1 bol úspešne vytvorený!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1396,7 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Spojenie vypršalo</translation>
    </message>
@@ -1403,7 +1404,7 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Neplatná JSON odpoveď z URL adresy</translation>
    </message>
@@ -1439,24 +1440,24 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Súbor sa nedá stiahnuť úplne.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
-        <translation type="unfinished"/>
+        <translation>Súbor sa medzitým zmenil</translation>
    </message>
 </context>
 <context>
@@ -1464,12 +1465,12 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/>
        <source>; Restoration Failed: %1</source>
-        <translation type="unfinished"/>
+        <translation>; Obnovenie zlyhalo: %1</translation>
    </message>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/>
        <source>Continue blacklisting:</source>
-        <translation type="unfinished"/>
+        <translation>Pokračovať v blacklistingu: </translation>
    </message>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/>
@@ -1485,7 +1486,7 @@ Nie je vhodné ju používať.</translation>
        <translation>Pozor, možná kolízia z dôvodu veľkosti písmen s %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>nepodarilo sa vytvoriť priečinok %1</translation>
    </message>
@@ -1495,12 +1496,12 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="60"/>
        <source>Error removing &apos;%1&apos;: %2;</source>
-        <translation type="unfinished"/>
+        <translation>Chyba pri odstraňovaní &apos;%1&apos;: %2;</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="71"/>
        <source>Could not remove directory &apos;%1&apos;;</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno odstrániť priečinok &apos;%1&apos;; </translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="86"/>
@@ -1511,7 +1512,7 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Súbor %1 nemôže byť premenovaný na %2 z dôvodu, že tento názov je už použitý</translation>
    </message>
@@ -1582,38 +1583,43 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Súbor zmazaný</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Lokálny súbor bol zmenený počas synchronizácie.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Súbor bol zmenený, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený a upravená verzia je uložená v konfliktnom súbore.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>Chýba URL adresa</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Lokálny súbor bol odstránený počas synchronizácie.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Server nepotvrdil posledný kúsok. (Nebol prítomný e-tag)</translation>
    </message>
@@ -1843,12 +1849,12 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="182"/>
        <source>Set &amp;password </source>
-        <translation type="unfinished"/>
+        <translation>Nastaviť &amp;heslo </translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="196"/>
        <source>Set &amp;expiration date</source>
-        <translation type="unfinished"/>
+        <translation>Nastaviť dátum &amp;expirácie</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="77"/>
@@ -1858,7 +1864,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="125"/>
        <source>Copy &amp;link</source>
-        <translation type="unfinished"/>
+        <translation>Skopírovať  &amp;odkaz</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="142"/>
@@ -1883,12 +1889,12 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="110"/>
        <source>Folder: %2</source>
-        <translation type="unfinished"/>
+        <translation>Priečinok: %2</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="114"/>
        <source>P&amp;assword protect</source>
-        <translation type="unfinished"/>
+        <translation>Ch&amp;rániť heslom</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="203"/>
@@ -1898,13 +1904,13 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="343"/>
        <source>The file can not be shared because it was shared without sharing permission.</source>
-        <translation type="unfinished"/>
+        <translation>Tento súbor nemožno zdieľať, lebo bol vyzdieľaný bez možnosti ďalšieho zdieľania.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="506"/>
        <location filename="../src/gui/sharedialog.cpp" line="507"/>
        <source>&amp;Share link</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Zdieľať odkaz</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="525"/>
@@ -2308,22 +2314,22 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="145"/>
        <source>CSync failed to access</source>
-        <translation type="unfinished"/>
+        <translation>Prístup pre CSync zlyhal</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="160"/>
        <source>The service is temporarily unavailable</source>
-        <translation type="unfinished"/>
+        <translation>Služba je dočasne nedostupná</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="166"/>
        <source>An error occurred while opening a directory</source>
-        <translation type="unfinished"/>
+        <translation>Nastala chyba počas otvárania priečinka.</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="169"/>
        <source>An internal error number %1 occurred.</source>
-        <translation type="unfinished"/>
+        <translation>Vyskytla sa interná chyba číslo %1.</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="224"/>
@@ -2353,7 +2359,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="376"/>
        <source>Filename is too long.</source>
-        <translation type="unfinished"/>
+        <translation>Meno súboru je veľmi dlhé.</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="397"/>
@@ -2439,21 +2445,35 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Verzia %1. Pre viac informácií choďte na &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Šíri %1 pod licenciou GNU General Public License (GPL) Verzia 2.0.&lt;br/&gt;%2 a %2 logo sú registrované známky %1 v USA, ostatných krajinách, alebo oboje.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>Hlavička kontrolného súčtu je poškodená.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>Stiahnutý súbor nemá správny kontrolný súčet, bude stiahnutý znovu.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2847,27 +2867,27 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2888,9 +2908,9 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;&lt;small&gt;Zostavené z Git revízie &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; na %3, %4 s použitím Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
@@ -2908,7 +2928,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/libsync/progressdispatcher.cpp" line="36"/>
        <source>Downloaded, renamed conflicting file</source>
-        <translation type="unfinished"/>
+        <translation>Stiahnuté, konfliktný súbor bol premenovaný</translation>
    </message>
    <message>
        <location filename="../src/libsync/progressdispatcher.cpp" line="38"/>
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -713,22 +713,22 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Odziv strežnika kaže na neveljaven obseg vsebine</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Povezava je časovno potekla</translation>
    </message>
@@ -1249,114 +1249,114 @@ Uporaba ni priporočljiva.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Strežnik ne dovoli dostopa. Če želite preveriti, ali imate ustrezen dostop,  &lt;a href=&quot;%1&quot;&gt;kliknite tu&lt;/a&gt; za dostop do te storitve z vašim brskalnikom.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Krajevna mapa %1 že obstaja. Nastavljena bo za usklajevanje.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>je v redu</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>je spodletelo.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Krajevne mape %1 ni mogoče ustvariti.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Ni navedenega oddaljenega strežnika!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Napaka: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>ustvarjanje mape v oblaku ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Oddaljena mapa %1 je uspešno ustvarjena.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Oddaljena mapa %1 že obstaja. Vzpostavljena bo povezava za usklajevanje.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Ustvarjanje mape je povzročilo napako HTTP %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Ustvarjanje mape na oddaljenem naslovu je spodletelo zaradi napačnih poveril. &lt;br/&gt;Vrnite se in preverite zahtevana gesla.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Ustvarjanje oddaljene mape je spodletelo. Najverjetneje je vzrok v neustreznih poverilih.&lt;/font&gt;&lt;br/&gt;Vrnite se na predhodno stran in jih preverite.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Ustvarjanje oddaljene mape %1 je spodletelo z napako &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Povezava za usklajevanje med %1 in oddaljeno mapo %2 je vzpostavljena.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Povezava z %1 je  uspešno vzpostavljena!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Povezave z %1 ni mogoče vzpostaviti. Preveriti je treba nastavitve.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Preimenovanje mape je spodletelo</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, saj je mapa oziroma dokument v njej odprt v z drugim programom. Zaprite mapo/dokument ali prekinite namestitev.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Krajevno usklajena mapa %1 je uspešno ustvarjena!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1395,7 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Povezava časovno pretekla</translation>
    </message>
@@ -1403,7 +1403,7 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1439,22 +1439,22 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Datoteke ni mogoče v celoti prejeti.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1485,7 +1485,7 @@ Uporaba ni priporočljiva.</translation>
        <translation>Pozor, mogoče je neskladje v velikosti črk imena %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>ni mogoče ustvariti mape %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Datoteke %1 ni mogoče preimenovati v %2 zaradi že obstoječe datoteke s tem imenom.</translation>
    </message>
@@ -1582,38 +1582,43 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Datoteka je odstranjena</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Datoteka je bila krajevno spremenjena, vendar pa je označena za souporabo le za branje. Izvorna datoteka je obnovljena, vaše spremembe pa so zabeležene v datoteki spora.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Krajevna datoteka je bila me usklajevanjem odstranjena.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Strežnik ni prepoznal zadnjega niza besed. (ni določenih e-oznak)</translation>
    </message>
@@ -2433,21 +2438,35 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Različica %1. Za več podrobnosti si oglejte &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Programski paket objavlja %1 pod pogoji Splošnega javnega dovoljenja GNU (GNU General Public License - GPL), različice 2.0.&lt;br&gt;%2 in logotip %2 sta blagovni znamki %1 v Združenih državah, drugih državah ali oboje.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2841,27 +2860,27 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2882,7 +2901,7 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>Одредишни фајл има неочекивану величину или време измене</translation>
    </message>
@@ -713,22 +713,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Нема е-ознаке са сервера. Проверите прокси или мрежни излаз</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Добијена је различита е-ознака за наставак преноса. Покушаћу поново следећи пут.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Сервер је вратио погрешан опсег садржаја</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Време за повезивање је истекло</translation>
    </message>
@@ -1250,114 +1250,114 @@ It is not advisable to use it.</source>
        <translation>Аутентификован захтев серверу је преусмерен на %1. УРЛ је лош, сервер је лоше подешен.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>Добијен је неисправан одговор на аутентификовани ВебДАВ захтев</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Сервер није дозволио приступ. Да проверите имате ли исправан приступ, &lt;a href=&quot;%1&quot;&gt;кликните овде&lt;/a&gt; да бисте приступили услузи из прегледача.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Локална фасцикла %1 већ постоји. Одређујем је за синхронизацију.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>Правим локалну фасциклу синхронизације %1...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>у реду</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>неуспешно</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Не могу да направим локалну фасциклу %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Није наведена удаљена фасцикла!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Грешка: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>правим фасциклу у облаку: % 1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Удаљена фасцикла %1 је успешно направљена.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Удаљена фасцикла %1 већ постоји. Повезујем се ради синхронизовања.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Прављење фасцикле довело је до ХТТП грешке са кодом %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Прављење удаљене фасцикле није успело због погрешних акредитива!&lt;br/&gt;Идите назад и проверите ваше акредитиве.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Прављење удаљене фасцикле није успело због погрешних акредитива.&lt;/font&gt;&lt;br/&gt;Идите назад и проверите ваше акредитиве.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Прављење удаљене фасцикле %1 није успело због грешке &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>Веза за синхронизацију %1 до удаљеног директоријума %2 је подешена.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Успешно повезан са %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Не може се успоставити веза са %1. Проверите поново.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Преименовање није успело</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Не могу да уклоним и направим резервну копију фасцикле јер су фасцикла или фајл отворени у другом програму. Затворите фасциклу или фајл и покушајте поново или одустаните од подешавања.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Локална фасцикла за синхронизовање %1 је успешно направљена!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1396,7 +1396,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Веза је истекла</translation>
    </message>
@@ -1404,7 +1404,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Неисправан ЈСОН одговор са адресе упита</translation>
    </message>
@@ -1440,22 +1440,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Фајл %1 се не може преузети јер се судара са називом локалног фајла!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Фајл није могао бити преузет у потпуности.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>Фајл је измењен у међувремену</translation>
    </message>
@@ -1486,7 +1486,7 @@ It is not advisable to use it.</source>
        <translation>Пажња! Могуће сударање због величине слова са %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>не могу да направим директоријум %1</translation>
    </message>
@@ -1512,7 +1512,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Фајл %1 се не може преименовати у %2 због сударања са називом локалног фајла</translation>
    </message>
@@ -1583,38 +1583,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Фајл уклоњен</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Локални фајл је измењен током синхронизације. Биће настављена.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Локални фајл измењен током синхронизације.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation>Присили прекид посла код прекида ХТТП везе са КуТ &lt; 5.4.2</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Фајл је измењен локално али је у саставу дељења које је само за читање. Враћен је у претходно стање а измене су у фајлу сукоба.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>Адреса упита недостаје</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Локални фајл је уклоњен током синхронизације.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Сервер није потврдио последње парче. (није било е-ознаке)</translation>
    </message>
@@ -2440,21 +2445,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Верзија %1. За више информација посетите &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Ауторска права оунКлауд (ownCloud), корпорација&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Дистрибуира %1 под ГНУ општом јавном лиценцом (ОЈЛ) верзија 2.0.&lt;br/&gt;%2 и %2 лого су регистроване марке %1 у САД, другим земљама или обоје&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>Заглавље контролне суме је лоше формирано.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>Преузети фајл се не поклапа с контролном сумом. Биће настављено.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2848,27 +2867,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2889,7 +2908,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;small&gt;Направљено од ГИТ ревизије &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; %3, %4 користећи КуТ %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -713,22 +713,22 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Ingen E-Tag mottogs från servern, kontrollera proxy/gateway</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Servern returnerade felaktig content-range</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Anslutningen avbröts på grund av timeout</translation>
    </message>
@@ -1249,114 +1249,114 @@ Det är inte lämpligt använda den.</translation>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Lokal synkmapp %1 finns redan, aktiverar den för synk.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>misslyckades.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Kunde inte skapa lokal mapp %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Ingen fjärrmapp specificerad! </translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Fel: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>skapar mapp på ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Fjärrmapp %1 har skapats.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Fjärrmappen %1 finns redan. Ansluter den för synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Skapande av mapp resulterade i HTTP felkod %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Det gick inte att skapa mappen efter som du inte har tillräckliga rättigheter!&lt;br/&gt;Vänligen återvänd och kontrollera dina rättigheter.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Misslyckades skapa fjärrmappen, troligen p.g.a felaktiga inloggningsuppgifter.&lt;/font&gt;&lt;br/&gt;Kontrollera dina inloggningsuppgifter.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Misslyckades skapa fjärrmapp %1 med fel &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>En synkroniseringsanslutning från %1 till fjärrmappen %2 har skapats.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Ansluten till %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Anslutningen till %1 kunde inte etableras. Var god kontrollera och försök igen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Omdöpning av mapp misslyckades</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Kan inte ta bort och göra en säkerhetskopia av mappen på grund av att mappen eller en fil i den används av ett annat program. Vänligen stäng mappen eller filen och försök igen eller avbryt installationen.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Lokal synkmapp %1 skapad!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1395,7 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Anslutningen avbröts på grund av timeout</translation>
    </message>
@@ -1403,7 +1403,7 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1439,22 +1439,22 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Filen kunde inte laddas ner fullständigt.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1485,7 +1485,7 @@ Det är inte lämpligt använda den.</translation>
        <translation>Observera, eventuell skiftlägeskänslig konflikt med %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>kunde ej skapa katalogen %1</translation>
    </message>
@@ -1511,7 +1511,7 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Filen %1 kan inte döpas om till %2 på grund av ett lokalt filnamn</translation>
    </message>
@@ -1582,38 +1582,43 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Filen Raderad</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Lokal fil ändrades under synk.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Filen ändrades lokalt men är en del av en endast-läsbar delning. Den återställdes och din editering är i konflikt filen.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Den lokala filen togs bort under synkronisering.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Servern bekräftade inte det sista fil-fragmentet (Ingen e-tag fanns tillgänglig)</translation>
    </message>
@@ -2433,21 +2438,35 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Version %1. För mer information vänligen besök &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Distribueras av %1 och licenserad under GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 och %2 logotyp är registrerade varumärken av %1 i Förenta Staterna, andra länder, eller både och.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2841,27 +2860,27 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2882,7 +2901,7 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -2,9 +2,9 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
-        <translation type="unfinished"/>
+        <translation>Hedef dosya beklenilmeyen boyuta veya düzenlenme tarihine sahip</translation>
    </message>
 </context>
 <context>
@@ -318,7 +318,7 @@ Toplam kalan süre: %5</translation>
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="144"/>
        <source>Authentication error: Either username or password are wrong.</source>
-        <translation>Giriş hatası: Kullanıcı adı veya şifre yanlış.</translation>
+        <translation>Giriş hatası: Kullanıcı adı veya parola hatalı.</translation>
    </message>
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="146"/>
@@ -661,7 +661,7 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="309"/>
        <source>Authentication failed accessing %1</source>
-        <translation>%1 erişim için giriş başarısız</translation>
+        <translation>%1 erişimi için giriş başarısız</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="311"/>
@@ -702,33 +702,33 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="46"/>
        <source>&lt;b&gt;Warning:&lt;/b&gt; %1</source>
-        <translation>&lt;b&gt;Dikkat:&lt;/b&gt; %1</translation>
+        <translation>&lt;b&gt;Uyarı:&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>&lt;b&gt;Dikkat:&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Uyarı:&lt;/b&gt;</translation>
    </message>
 </context>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Sunucudan E-Tag alınamadı, Vekil Sunucu/Ağ Geçidi&apos;ni denetleyin.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Devam etmek üzere farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Sunucu yanlış içerik aralığı döndürdü</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Bağlantı Zaman Aşımı</translation>
    </message>
@@ -867,7 +867,7 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="71"/>
        <source>&amp;Search:</source>
-        <translation>&amp;Arama:</translation>
+        <translation>&amp;Ara:</translation>
    </message>
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="79"/>
@@ -907,7 +907,7 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="194"/>
        <source>Could not write to log file %1</source>
-        <translation>Log dosyasına yazılamıyor %1</translation>
+        <translation>%1 günlük dosyasına yazılamadı</translation>
    </message>
 </context>
 <context>
@@ -1065,7 +1065,7 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="56"/>
        <source>New %1 Update Ready</source>
-        <translation>%1 Güncelleme hazır</translation>
+        <translation>Yeni %1 Güncellemesi Hazır</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="57"/>
@@ -1139,7 +1139,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/>
        <source>Sync the directory &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; dizini senkronize et</translation>
+        <translation>&apos;%1&apos; dizinini eşitle</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
@@ -1249,114 +1249,114 @@ Kullanmanız önerilmez.</translation>
        <translation>Sunucuda giriş sırasında istek &apos;%1&apos; adresine yönlendirilmiş. Adres hatalı veya sunucu yanlış ayarlanmış.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
-        <translation>Yetkilendirilmiş webdav isteği geçersiz bir cevap verdi</translation>
+        <translation>Yetkilendirilmiş webdav isteği geçersiz bir cevap alındı</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Erişim sunucu tarafından yasaklandı. Geçerli erişime sahip olup olmadığınızı doğrulamak için hizmete web tarayıcınızla erişmek üzere &lt;a href=&quot;%1&quot;&gt;buraya tıklayın&lt;/a&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Yerel eşitleme klasörü %1 zaten mevcut, eşitlemek için ayarlanıyor.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
-        <translation>Yerel eşitleme klasörü oluşturuluyor %1...</translation>
+        <translation>Yerel eşitleme klasörü %1 oluşturuluyor...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>tamam</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>başarısız.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>%1 yerel klasörü oluşturulamadı</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Uzak klasör belirtilmemiş!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Hata: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>ownCloud üzerinde klasör oluşturuluyor: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>%1 uzak klasörü başarıyla oluşturuldu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Uzak klasör %1 zaten mevcut. Eşitlemek için bağlanılıyor.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Klasör oluşturma %1 HTTP hata kodu ile sonuçlandı</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Uzak klasör oluşturması, geçersiz kimlik bilgileri nedeniyle başarısız!&lt;br/&gt;Lütfen geri gidin ve bilgileri denetleyin.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Uzak klasör oluşturma muhtemelen hatalı kimlik bilgilerinden dolayı başarısız oldu.&lt;/font&gt;&lt;br/&gt;Lütfen geri gidip kimlik bilgilerini doğrulayın.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Uzak klasör %1 oluşturma işlemi &lt;tt&gt;%2&lt;/tt&gt; hatası ile başarısız oldu.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>%1 kaynaklı %2 uzak dizinine bir eşitleme bağlantısı ayarlandı.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>%1 bağlantısı başarılı!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>%1 bağlantısı kurulamadı. Lütfen tekrar denetleyin.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Klasör adlandırma başarısız</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Klasör veya içerisindeki bir dosya farklı bir program içerisinde açık olduğundan, kaldırma ve yedekleme işlemi yapılamıyor. Lütfen klasör veya dosyayı kapatıp yeniden deneyin veya kurulumu iptal edin.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Yerel eşitleme klasörü %1 başarıyla oluşturuldu!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1395,7 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Bağlantı Zaman Aşımı</translation>
    </message>
@@ -1403,7 +1403,7 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Getirme URL&apos;sinden geçersiz JSON yanıtı</translation>
    </message>
@@ -1439,24 +1439,24 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Dosya tamamıyla indirilemedi.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi!</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
-        <translation type="unfinished"/>
+        <translation>Dosya, bulunduğundan itibaren değişmiş</translation>
    </message>
 </context>
 <context>
@@ -1464,7 +1464,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/>
        <source>; Restoration Failed: %1</source>
-        <translation>; Yeniden yapılandırma başarısız: %1</translation>
+        <translation>; Geri Yükleme Başarısız: %1</translation>
    </message>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/>
@@ -1485,7 +1485,7 @@ Kullanmanız önerilmez.</translation>
        <translation>Uyarı, %1 ile muhtemel harf duyarlılığı çatışması</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>%1 dizini oluşturulamadı</translation>
    </message>
@@ -1495,12 +1495,12 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="60"/>
        <source>Error removing &apos;%1&apos;: %2;</source>
-        <translation>Silme hatası &apos;%1&apos;: %2;</translation>
+        <translation>&apos;%1&apos; silme hatası: %2;</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="71"/>
        <source>Could not remove directory &apos;%1&apos;;</source>
-        <translation>Dizin silinemiyor &apos;%1&apos;;</translation>
+        <translation>&apos;%1&apos; dizini silinemiyor;</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="86"/>
@@ -1511,7 +1511,7 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>Yerel bir dosya adı çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı</translation>
    </message>
@@ -1526,7 +1526,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
-        <translation>Sunucudan yanlış HTTP kodu dönüyor. 204 bekliyorduk, ama &quot;%1 %2&quot; geldi.</translation>
+        <translation>Sunucudan yanlış HTTP kodu döndü. 204 bekleniyordu, ancak &quot;%1 %2&quot; geldi.</translation>
    </message>
 </context>
 <context>
@@ -1534,7 +1534,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
-        <translation>Sunucudan yanlış HTTP kodu dönüyor. 201 bekliyorduk, ama &quot;%1 %2&quot; geldi.</translation>
+        <translation>Sunucudan yanlış HTTP kodu döndü. 201 bekleniyordu, ancak &quot;%1 %2&quot; geldi.</translation>
    </message>
 </context>
 <context>
@@ -1557,7 +1557,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="143"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
-        <translation>Sunucudan yanlış HTTP kodu dönüyor. 201 bekliyorduk, ama &quot;%1 %2&quot; geldi.</translation>
+        <translation>Sunucudan yanlış HTTP kodu döndü. 201 bekleniyordu, ancak &quot;%1 %2&quot; geldi.</translation>
    </message>
 </context>
 <context>
@@ -1582,38 +1582,43 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Dosya Kaldırıldı</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Eşitleme sırasında yerel dosya değişti. Devam edilecek.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Eşitleme sırasında yerel dosya değişti.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
-        <translation type="unfinished"/>
+        <translation>Qt &lt; 5.4.2 ile HTTP bağlantı sıfırlamasında görev iptali zorlanıyor.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>Getirme URL&apos;si eksik</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Eşitleme sırasında yerel dosya kaldırıldı.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
    </message>
@@ -1841,12 +1846,12 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="182"/>
        <source>Set &amp;password </source>
-        <translation>&amp;Şifre belirle</translation>
+        <translation>&amp;Parola belirle</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="196"/>
        <source>Set &amp;expiration date</source>
-        <translation>Sonlanma tarihi b&amp;elirle</translation>
+        <translation>Son kullanma tarihi b&amp;elirle</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="77"/>
@@ -1881,12 +1886,12 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="110"/>
        <source>Folder: %2</source>
-        <translation>Dizin: %2</translation>
+        <translation>Klasör: %2</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="114"/>
        <source>P&amp;assword protect</source>
-        <translation>Şi&amp;fre koruma</translation>
+        <translation>&amp;Parola koruması</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="203"/>
@@ -1902,7 +1907,7 @@ Kullanmanız önerilmez.</translation>
        <location filename="../src/gui/sharedialog.cpp" line="506"/>
        <location filename="../src/gui/sharedialog.cpp" line="507"/>
        <source>&amp;Share link</source>
-        <translation>Bağlantıyı pa&amp;ylaş</translation>
+        <translation>&amp;Paylaşma bağlantısı</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="525"/>
@@ -1917,7 +1922,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="559"/>
        <source>Cannot find an folder to upload to.</source>
-        <translation>Yüklenecek dizin bulunamıyor.</translation>
+        <translation>Yüklenecek klasör bulunamıyor.</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="581"/>
@@ -1937,7 +1942,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="448"/>
        <source>Public sh&amp;aring requires a password</source>
-        <translation type="unfinished"/>
+        <translation>Herkese &amp;açık paylaşım için parola gerekir</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="470"/>
@@ -2311,7 +2316,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="160"/>
        <source>The service is temporarily unavailable</source>
-        <translation>Heçici olarak hizmet verilemiyor</translation>
+        <translation>Hizmet geçiçi olarak kullanılamıyor</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="166"/>
@@ -2321,7 +2326,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="169"/>
        <source>An internal error number %1 occurred.</source>
-        <translation>Dahili bir hata oluştu %1</translation>
+        <translation>%1 numaralı dahili bir hata oluştu </translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="224"/>
@@ -2437,21 +2442,35 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Sürüm %1. Daha fazla bilgi için lütfen &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt; adresini ziyaret edin.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt;Telif Hakkı ownCloud Anonim Şirketi&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;%1 tarafından dağıtılmış ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.&lt;br/&gt;%2 ve %2 logoları ABD ve/veya diğer ülkelerde %1 tescili markalarıdır.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>Sağlama toplam başlığı bozulmuş.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>İndirilen dosya sağlama toplamı ile eşleşmiyor, devam edilecek.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2845,27 +2864,27 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2886,9 +2905,9 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;small&gt; &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; numaralı Git revizyonunundan oluşturuldu %3, %4 Qt kullanılıyor %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;&lt;small&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; Git gözden geçirmesi ile %3, %4 tarihinde, Qt %5, %6 kullanılarak derlendi.&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -2,9 +2,9 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
-        <translation type="unfinished"/>
+        <translation>Файл призначення має неочікуваний розмір або час редагування</translation>
    </message>
 </context>
 <context>
@@ -661,7 +661,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="309"/>
        <source>Authentication failed accessing %1</source>
-        <translation type="unfinished"/>
+        <translation>Помилка аутентифікації при доступі до %1</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="311"/>
@@ -713,22 +713,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>Не отримано E-Tag від серверу, перевірте мережеві налаштування (проксі, шлюз)</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>Ми отримали інший E-Tag для відновлення. Спробуйте ще раз пізніше.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>Сервер повернув невірний content-range</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>Тайм-аут З&apos;єднання</translation>
    </message>
@@ -907,7 +907,7 @@ Checked items will also be deleted if they prevent a directory from being remove
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="194"/>
        <source>Could not write to log file %1</source>
-        <translation type="unfinished"/>
+        <translation>Не вдалося записати в файл журналу %1</translation>
    </message>
 </context>
 <context>
@@ -1065,13 +1065,13 @@ Checked items will also be deleted if they prevent a directory from being remove
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="56"/>
        <source>New %1 Update Ready</source>
-        <translation type="unfinished"/>
+        <translation>Доступне оновлення %1</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="57"/>
        <source>A new update for %1 is about to be installed. The updater may ask
 for additional privileges during the process.</source>
-        <translation type="unfinished"/>
+        <translation>Буде встановлено оновлення для %1. Програма оновлення може запитати додаткові привілеї.</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="78"/>
@@ -1139,7 +1139,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="138"/>
        <source>Sync the directory &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Синхронізувати каталог &apos;%1&apos;</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
@@ -1246,117 +1246,117 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="258"/>
        <source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
-        <translation type="unfinished"/>
+        <translation>Запит аутентифікації до серверу було переадресовано до &apos;%1&apos;. Поганий URL, сервер сконфігуровано неправильно.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
-        <translation type="unfinished"/>
+        <translation>Неправильна відповідь на автентифікований запит webdav</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>Доступ заборонений сервером. Щоб довести, що у Вас є права доступу, &lt;a href=&quot;%1&quot;&gt;клікніть тут&lt;/a&gt; для входу через Ваш браузер.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>Локальна тека синхронізації %1 вже існує, налаштування її для синхронізації.&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
-        <translation type="unfinished"/>
+        <translation>Створення локальної теки для синхронізації %1...</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>не вдалося.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>Не вдалося створити локальну теку $1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>Не вказано віддалену теку!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>Помилка: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>створення теки на ownCloud: %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>Віддалена тека %1 успішно створена.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>Віддалена тека %1 вже існує. Під&apos;єднання для синхронізації.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>Створення теки завершилось HTTP помилкою %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>Створити віддалену теку не вдалося через невірно вказані облікові дані.&lt;br/&gt;Поверніться назад та перевірте облікові дані.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Створити віддалену теку не вдалося, можливо, через невірно вказані облікові дані.&lt;/font&gt;&lt;br/&gt;Будь ласка, поверніться назад та перевірте облікові дані.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>Не вдалося створити віддалену теку %1 через помилку &lt;tt&gt;%2&lt;/tt&gt;.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>З&apos;єднання для синхронізації %1 з віддаленою текою %2 було встановлено.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>Успішно під&apos;єднано до %1!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>Підключення до %1 встановити не вдалося. Будь ласка, перевірте ще раз.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>Не вдалося перейменувати теку</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>Неможливо видалити теку та створити її резервну копію, оскільки тека або файли, що в ній розташовані,  використовуються. Будь ласка, закрийте всі програми, що можуть використовувати цю теку та спробуйте ще раз, або скасуйте встановлення.</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Локальна тека синхронізації %1 успішно створена!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1395,7 +1395,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>Тайм-аут З&apos;єднання</translation>
    </message>
@@ -1403,7 +1403,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>Неправильна JSON відповідь на сформований URL</translation>
    </message>
@@ -1439,24 +1439,24 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>Файл %1 не завантажено, через локальний конфлікт ім&apos;я! </translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>Файл не може бути завантажений повністю.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>Файл %1 не збережено, через локальний конфлікт ім&apos;я! </translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
-        <translation type="unfinished"/>
+        <translation>Файл змінився з моменту знаходження</translation>
    </message>
 </context>
 <context>
@@ -1464,12 +1464,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="86"/>
        <source>; Restoration Failed: %1</source>
-        <translation type="unfinished"/>
+        <translation>; Відновлення не вдалося: %1</translation>
    </message>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="109"/>
        <source>Continue blacklisting:</source>
-        <translation type="unfinished"/>
+        <translation>Продовжити занесення до чорного списку:</translation>
    </message>
    <message>
        <location filename="../src/libsync/owncloudpropagator.cpp" line="205"/>
@@ -1485,7 +1485,7 @@ It is not advisable to use it.</source>
        <translation>Увага, можливий конфлікт чутливості до реєстру з %1</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>Не вдалося створити теку %1</translation>
    </message>
@@ -1500,7 +1500,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="71"/>
        <source>Could not remove directory &apos;%1&apos;;</source>
-        <translation type="unfinished"/>
+        <translation>Неможливо видалити теку &apos;%1&apos;;</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="86"/>
@@ -1511,7 +1511,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>%1 не можна перейменувати на %2 через локальний конфлікт імен</translation>
    </message>
@@ -1526,7 +1526,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagateremotedelete.cpp" line="114"/>
        <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
-        <translation type="unfinished"/>
+        <translation>Сервер відповів неправильним HTTP кодом. Очікувався 204, але отримано &quot;%1 %2&quot;.</translation>
    </message>
 </context>
 <context>
@@ -1534,7 +1534,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagateremotemkdir.cpp" line="71"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
-        <translation type="unfinished"/>
+        <translation>Сервер відповів неправильним HTTP кодом. Очікувався 201, але отримано &quot;%1 %2&quot;.</translation>
    </message>
 </context>
 <context>
@@ -1557,7 +1557,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagateremotemove.cpp" line="143"/>
        <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
-        <translation type="unfinished"/>
+        <translation>Сервер відповів неправильним HTTP кодом. Очікувався 201, але отримано &quot;%1 %2&quot;.</translation>
    </message>
 </context>
 <context>
@@ -1582,38 +1582,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>Файл переміщено</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation>Локальний файл змінився під час синхронізації. Його буде відновлено.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>Локальний файл змінився під час синхронізації.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
-        <translation type="unfinished"/>
+        <translation>Примусове припинення завдання при скиданні HTTP з’єднання з Qt &lt; 5.4.2.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>Файл було змінено локально, але він розташований в теці з правами лише на перегляд. Файл відновлено, а ваші зміни розташовані в теці конфліктів.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>Не вистачає сформованого URL</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>Локальний файл було видалено під час синхронізації.</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>Сервер не зміг підтвердити останній відрізок даних. (Були відсутні e-tag)</translation>
    </message>
@@ -1843,12 +1848,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="182"/>
        <source>Set &amp;password </source>
-        <translation type="unfinished"/>
+        <translation>Встановити &amp;пароль</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="196"/>
        <source>Set &amp;expiration date</source>
-        <translation type="unfinished"/>
+        <translation>Встановити т&amp;ермін дії</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="77"/>
@@ -1858,7 +1863,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="125"/>
        <source>Copy &amp;link</source>
-        <translation type="unfinished"/>
+        <translation>Копіювати п&amp;осилання</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.ui" line="142"/>
@@ -1883,12 +1888,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="110"/>
        <source>Folder: %2</source>
-        <translation type="unfinished"/>
+        <translation>Тека: %2</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="114"/>
        <source>P&amp;assword protect</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Захистити паролем</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="203"/>
@@ -1904,7 +1909,7 @@ It is not advisable to use it.</source>
        <location filename="../src/gui/sharedialog.cpp" line="506"/>
        <location filename="../src/gui/sharedialog.cpp" line="507"/>
        <source>&amp;Share link</source>
-        <translation type="unfinished"/>
+        <translation>По&amp;ділитись посиланням</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="525"/>
@@ -1939,7 +1944,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="448"/>
        <source>Public sh&amp;aring requires a password</source>
-        <translation type="unfinished"/>
+        <translation>Публічне по&amp;ширення вимагає пароль</translation>
    </message>
    <message>
        <location filename="../src/gui/sharedialog.cpp" line="470"/>
@@ -2323,7 +2328,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="169"/>
        <source>An internal error number %1 occurred.</source>
-        <translation type="unfinished"/>
+        <translation>Виникла внутрішня помилка за номером %1.</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="224"/>
@@ -2439,21 +2444,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Версія %1. Для отримання більш детальної інформації, будь ласка, відвідайте &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation>&lt;p&gt; Права належать ownCloud, Incorporated &lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Поширюється  через %1 і під ліцензією GNU General Public License (GPL) версії 2.0&lt;br/&gt;%2 логотип  %2 є зареєстрованими торговими марками %1 у Сполучених Штатах та інших країнах, або обох.&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation>Заголовок контрольної суми пошкоджено.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation>Завантажений файл не відповідає контрольній сумі, його буде відновлено.</translation>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2847,27 +2866,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 Тіб</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 ГіБ</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 МіБ</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 КіБ </translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 Б</translation>
    </message>
@@ -2888,9 +2907,9 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;&lt;small&gt;Зібрано з Git ревізії &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; %3, %4, використовуючи Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation>目标文件有意想不到的大小和修改时间</translation>
    </message>
@@ -713,22 +713,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation>未能收到来自服务器的 E-Tag，请检查代理/网关</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation>我们收到了不同的恢复 E-Tag，将在下次尝试。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>服务器返回了错误的内容长度</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>连接超时</translation>
    </message>
@@ -1248,114 +1248,114 @@ It is not advisable to use it.</source>
        <translation>被发送到服务器的认证请求被重定向到&apos;%1&apos;。此URL无效，服务器配置错误。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation>对于一个验证的 webdav 请求，有一个无效的响应</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation>服务器拒绝了访问。&lt;a href=&quot;%1&quot;&gt;点击这里打开浏览器&lt;/a&gt; 来确认您是否有权访问。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>本地同步文件夹 %1 已存在，将使用它来同步。&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation>创建本地同步目录%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>成功</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>失败</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>不能创建本地文件夹 %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation>未指定远程文件夹！</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>错误：%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>在 ownCloud 创建文件夹：%1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>远程目录%1成功创建。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>远程文件夹 %1 已存在。连接它以供同步。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>创建文件夹出现 HTTP 错误代码 %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>远程文件夹创建失败，因为提供的凭证有误！&lt;br/&gt;请返回并检查您的凭证。&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;远程文件夹创建失败，可能是由于提供的用户名密码不正确。&lt;/font&gt;&lt;br/&gt;请返回并检查它们。&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>创建远程文件夹 %1 失败，错误为 &lt;tt&gt;%2&lt;/tt&gt;。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>已经设置了一个 %1 到远程文件夹 %2 的同步连接</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>成功连接到了 %1！</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>无法建立到 %1的链接，请稍后重试</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>文件夹更名失败</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation>无法移除和备份文件夹，由于文件夹或文件正在被另一程序占用。请关闭程序后重试，或取消安装。</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;本地同步目录 %1 已成功创建&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1394,7 +1394,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>连接超时</translation>
    </message>
@@ -1402,7 +1402,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation>推送 URL 传来的 JSON 无效</translation>
    </message>
@@ -1438,22 +1438,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation>由于本地文件名冲突，文件 %1 无法下载。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>文件无法完整下载。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation>由于本地文件名冲突，文件 %1 无法保存。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation>自从发现文件以来，它已经被改变了</translation>
    </message>
@@ -1484,7 +1484,7 @@ It is not advisable to use it.</source>
        <translation>小心！%1 的文件名可能有大小写冲突</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>不能创建文件夹 %1</translation>
    </message>
@@ -1510,7 +1510,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation>由于本地文件名冲突，文件 %1 无法更名为 %2</translation>
    </message>
@@ -1581,38 +1581,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>已移除文件</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation>本地文件在同步时已修改。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation>文件已经在本地修改，但这是某个只读分享的一部分，原文件已经恢复。您的修改已保存在冲突文件中。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation>缺少轮询 URL</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation>本地文件在同步时已删除。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation>服务器找不到上一分块。（找不到 E-tag）</translation>
    </message>
@@ -2434,21 +2439,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation>&lt;p&gt;版本 %1。详情请见 &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2842,27 +2861,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2883,7 +2902,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -2,7 +2,7 @@
 <context>
    <name>FileSystem</name>
    <message>
-        <location filename="../src/libsync/filesystem.cpp" line="191"/>
+        <location filename="../src/libsync/filesystem.cpp" line="196"/>
        <source>The destination file has an unexpected size or modification time</source>
        <translation type="unfinished"/>
    </message>
@@ -710,22 +710,22 @@ Are you sure you want to perform this operation?</source>
 <context>
    <name>OCC::GETFileJob</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="148"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="155"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="182"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
        <source>Server returned wrong content-range</source>
        <translation>伺服器回應錯誤的內容長度</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="287"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="289"/>
        <source>Connection Timeout</source>
        <translation>連線逾時</translation>
    </message>
@@ -1243,114 +1243,114 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="279"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
        <source>There was an invalid response to an authenticated webdav request</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="272"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="271"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="321"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/>
        <source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
        <translation>本地同步資料夾%1已存在, 將其設置為同步&lt;br/&gt;&lt;br/&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="323"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="324"/>
        <source>Creating local sync folder %1...</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="327"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
        <source>ok</source>
        <translation>ok</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="329"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="330"/>
        <source>failed.</source>
        <translation>失敗</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="331"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="332"/>
        <source>Could not create local folder %1</source>
        <translation>無法建立本地資料夾 %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="356"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
        <source>No remote folder specified!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="362"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/>
        <source>Error: %1</source>
        <translation>錯誤： %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="376"/>
        <source>creating folder on ownCloud: %1</source>
        <translation>在 ownCloud 建立資料夾： %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="391"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="392"/>
        <source>Remote folder %1 created successfully.</source>
        <translation>遠端資料夾%1建立成功!</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="394"/>
        <source>The remote folder %1 already exists. Connecting it for syncing.</source>
        <translation>遠端資料夾%1已存在,連線同步中</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="395"/>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="397"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="396"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>The folder creation resulted in HTTP error code %1</source>
        <translation>在HTTP建立資料夾失敗, error code %1</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="399"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="400"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>由於帳號或密碼錯誤，遠端資料夾建立失敗&lt;br/&gt;請檢查您的帳號密碼。&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="402"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
        <source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
        <translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;遠端資料夾建立失敗,也許是因為所提供的帳號密碼錯誤&lt;/font&gt;&lt;br/&gt;請重新檢查您的帳號密碼&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="408"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
        <source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
        <translation>建立遠端資料夾%1發生錯誤&lt;tt&gt;%2&lt;/tt&gt;失敗</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="424"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
        <translation>從%1到遠端資料夾%2的連線已建立</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="429"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="430"/>
        <source>Successfully connected to %1!</source>
        <translation>成功連接到 %1 ！</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="436"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="437"/>
        <source>Connection to %1 could not be established. Please check again.</source>
        <translation>無法建立連線%1, 請重新檢查</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
        <source>Folder rename failed</source>
        <translation>重新命名資料夾失敗</translation>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="450"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="451"/>
        <source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/gui/owncloudsetupwizard.cpp" line="496"/>
+        <location filename="../src/gui/owncloudsetupwizard.cpp" line="497"/>
        <source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
        <translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;本地同步資料夾 %1 建立成功!&lt;/b&gt;&lt;/font&gt;</translation>
    </message>
@@ -1389,7 +1389,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PUTFileJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="109"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="113"/>
        <source>Connection Timeout</source>
        <translation>連線逾時</translation>
    </message>
@@ -1397,7 +1397,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PollJob</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="166"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="170"/>
        <source>Invalid JSON reply from the poll URL</source>
        <translation type="unfinished"/>
    </message>
@@ -1433,22 +1433,22 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateDownloadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="312"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="314"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="483"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="485"/>
        <source>The file could not be downloaded completely.</source>
        <translation>檔案下載無法完成。</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="580"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="558"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="620"/>
        <source>File has changed since discovery</source>
        <translation type="unfinished"/>
    </message>
@@ -1479,7 +1479,7 @@ It is not advisable to use it.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="124"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="125"/>
        <source>could not create directory %1</source>
        <translation>無法建立目錄 %1</translation>
    </message>
@@ -1505,7 +1505,7 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateLocalRename</name>
    <message>
-        <location filename="../src/libsync/propagatorjobs.cpp" line="151"/>
+        <location filename="../src/libsync/propagatorjobs.cpp" line="152"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
        <translation type="unfinished"/>
    </message>
@@ -1576,38 +1576,43 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::PropagateUploadFileQNAM</name>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="203"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="226"/>
        <source>File Removed</source>
        <translation>檔案已移除</translation>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="217"/>
-        <location filename="../src/libsync/propagateupload.cpp" line="580"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+        <source>Local file changed during syncing. It will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="628"/>
        <source>Local file changed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="557"/>
        <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="512"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="565"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="546"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="594"/>
        <source>Poll URL missing</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="617"/>
        <source>The local file was removed during sync.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+        <location filename="../src/libsync/propagateupload.cpp" line="643"/>
        <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
        <translation type="unfinished"/>
    </message>
@@ -2425,21 +2430,35 @@ It is not advisable to use it.</source>
 <context>
    <name>OCC::Theme</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="265"/>
+        <location filename="../src/libsync/theme.cpp" line="270"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="269"/>
+        <location filename="../src/libsync/theme.cpp" line="274"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="270"/>
+        <location filename="../src/libsync/theme.cpp" line="275"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
 </context>
+<context>
+    <name>OCC::TransmissionChecksumValidator</name>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+        <source>The checksum header is malformed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+        <source>The downloaded file does not match the checksum, it will be resumed.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
    <name>OCC::ownCloudGui</name>
    <message>
@@ -2833,27 +2852,27 @@ It is not advisable to use it.</source>
 <context>
    <name>Utility</name>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="113"/>
+        <location filename="../src/libsync/utility.cpp" line="114"/>
        <source>%L1 TiB</source>
        <translation>%L1 TiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="116"/>
+        <location filename="../src/libsync/utility.cpp" line="117"/>
        <source>%L1 GiB</source>
        <translation>%L1 GiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="119"/>
+        <location filename="../src/libsync/utility.cpp" line="120"/>
        <source>%L1 MiB</source>
        <translation>%L1 MiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="122"/>
+        <location filename="../src/libsync/utility.cpp" line="123"/>
        <source>%L1 KiB</source>
        <translation>%L1 KiB</translation>
    </message>
    <message>
-        <location filename="../src/libsync/utility.cpp" line="125"/>
+        <location filename="../src/libsync/utility.cpp" line="126"/>
        <source>%L1 B</source>
        <translation>%L1 B</translation>
    </message>
@@ -2874,7 +2893,7 @@ It is not advisable to use it.</source>
 <context>
    <name>ownCloudTheme::about()</name>
    <message>
-        <location filename="../src/libsync/theme.cpp" line="251"/>
+        <location filename="../src/libsync/theme.cpp" line="256"/>
        <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
Author	SHA1	Message	Date
Daniel Molkentin	42513af536	Bump to rc2	2015-06-17 17:13:22 +02:00
Jenkins for ownCloud	676a2ff8ca	[tx-robot] updated from transifex	2015-06-17 02:18:55 -04:00
Jenkins for ownCloud	1e56349838	[tx-robot] updated from transifex	2015-06-16 02:19:00 -04:00
Jenkins for ownCloud	33b8064042	[tx-robot] updated from transifex	2015-06-15 02:18:42 -04:00
Jenkins for ownCloud	1f5170253c	[tx-robot] updated from transifex	2015-06-14 02:18:42 -04:00
Daniel Molkentin	ad6f2e03c9	1.8.3-rc1	2015-06-11 15:45:48 +02:00
Daniel Molkentin	4c3daf7927	Update ChangeLog for 1.8.3	2015-06-11 15:04:41 +02:00
Jenkins for ownCloud	4936f70d20	[tx-robot] updated from transifex	2015-06-11 02:18:59 -04:00
Markus Goetz	ecd2da185d	Update VERSION.cmake for 1.8.3	2015-06-10 17:40:49 +02:00
Jocelyn Turcotte	7a7bf4c561	NSIS: Force an update of the shell_extension #3320 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.	2015-06-10 17:01:08 +02:00
Markus Goetz	827e07700d	Documentation: Mention the git submodules	2015-06-10 16:48:34 +02:00
Jenkins for ownCloud	d142c554d1	[tx-robot] updated from transifex	2015-06-10 02:18:40 -04:00
Daniel Molkentin	69f2b2da7c	Bump version to 1.8.2 final	2015-06-08 14:10:08 +02:00
Daniel Molkentin	4000993200	Finish 1.8.2 ChangeLog	2015-06-08 14:06:57 +02:00
Olivier Goffart	2c6c21d753	AccountState: do not change the state when we stay connected This would cause a full sync every 30 seconds.	2015-06-08 12:14:37 +02:00
Jenkins for ownCloud	34384e3613	[tx-robot] updated from transifex	2015-06-08 02:18:37 -04:00
Jenkins for ownCloud	a42856ef84	[tx-robot] updated from transifex	2015-06-07 02:18:54 -04:00
Jenkins for ownCloud	e7f01b9a95	[tx-robot] updated from transifex	2015-06-07 01:15:27 -04:00
Klaas Freitag	fc2ceb88fb	Rename thread to SyncEngine Thread to avoid confusion about Neon.	2015-06-06 10:49:47 +02:00
Jenkins for ownCloud	36f62f7fd4	[tx-robot] updated from transifex	2015-06-06 02:18:54 -04:00
Christian Kamm	ee08b3759d	SyncScheduling: Avoid new resyncs on local mkdir. (cherry picked from commit `bacf6166c1`)	2015-06-05 10:27:28 +02:00
Klaas Freitag	c73110e3c7	Added changes between beta1 and rc1 to Changelog.	2015-06-05 09:39:56 +02:00
Klaas Freitag	9ced5fb9a3	Set version postfix to RC1	2015-06-05 09:26:22 +02:00
Daniel Molkentin	f9659d80c9	Revert "NSIS: depend on nsProcess instead of Processes NSIS plugin" This reverts commit `e1a36b53dc`.	2015-06-05 09:17:46 +02:00
Daniel Molkentin	553e831121	Revert "Adjust to new version of NSIS UAC" This reverts commit `1d600ceecc`.	2015-06-05 09:17:39 +02:00
Daniel Molkentin	e9ff471e1c	Revert "NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true." This reverts commit `0f7773ff99`.	2015-06-05 09:16:14 +02:00
Daniel Molkentin	eb6d29a223	Revert "NSIS: Fix NSIS error handling" This reverts commit `3df26ef189`.	2015-06-05 09:15:14 +02:00
Daniel Molkentin	3df26ef189	NSIS: Fix NSIS error handling	2015-06-05 08:45:23 +02:00
Jenkins for ownCloud	25767bee0b	[tx-robot] updated from transifex	2015-06-05 02:18:54 -04:00
Daniel Molkentin	0f7773ff99	NSIS: Star Trek taught me: "Reversing the polarity will fix it". It's true.	2015-06-04 12:53:42 +02:00
Christian Kamm	2ed329e025	Improve reporting of server error messages. #3220 In particular the 'unsupported client version' error message is now visible to the user when trying to connect to a server that no longer supports the current client version.	2015-06-04 10:07:24 +02:00
Christian Kamm	e04882cc7c	Discovery: Ignore folders with any 503. #3113	2015-06-04 09:24:53 +02:00
Jenkins for ownCloud	40818920d1	[tx-robot] updated from transifex	2015-06-04 02:18:53 -04:00
Daniel Molkentin	1bec652822	Merge pull request #3303 from owncloud/new_nsis_modules NSIS installer module updates	2015-06-03 21:05:47 +02:00
Christian Kamm	4c10f1e40c	Wizard: Show server error message if possible. #3220	2015-06-03 16:33:09 +02:00
Klaas Freitag	53154bcd1e	Merge pull request #3301 from owncloud/fix_3283 Abort the request and reset the QNAM if user does not ACK a new cert.	2015-06-03 10:22:13 +02:00
Daniel Molkentin	1d600ceecc	Adjust to new version of NSIS UAC	2015-06-03 08:21:10 +02:00
Daniel Molkentin	e1a36b53dc	NSIS: depend on nsProcess instead of Processes NSIS plugin The Processes plugin is no longer maintained, and OBS compiles an up-to-date version of nsProcess for us.	2015-06-03 08:21:10 +02:00
Jenkins for ownCloud	5f91abd7c6	[tx-robot] updated from transifex	2015-06-03 02:18:34 -04:00
Klaas Freitag	75b38d1a2f	Abort the request and reset the QNAM if user does not ACK a new cert. This is supposed to fix bug #3283	2015-06-02 12:21:49 +02:00
Jenkins for ownCloud	7f597e5dd2	[tx-robot] updated from transifex	2015-06-01 02:18:41 -04:00
Jenkins for ownCloud	e3be1a176d	[tx-robot] updated from transifex	2015-05-30 02:18:51 -04:00
Daniel Molkentin	b1658cb1cf	Merge pull request #3291 from RealRancor/backport_3004_2978_1.8 Backport #3004 and #2978 to 1.8	2015-05-28 17:22:06 +02:00
RealRancor	6ba3324035	Backport #3004 and #2978 to 1.8	2015-05-28 17:11:03 +02:00
Daniel Molkentin	e2a26f0eaf	Merge pull request #3289 from RealRancor/backport_3279_1.8 Backport #3279 to 1.8	2015-05-28 17:03:27 +02:00
RealRancor	8cfb17bca6	Backport #3279 to 1.8	2015-05-28 17:00:59 +02:00
Jenkins for ownCloud	211e5ec82e	[tx-robot] updated from transifex	2015-05-28 02:18:51 -04:00
Christian Kamm	2435ba7e7d	Windows: Fix unit test build.	2015-05-27 14:59:28 +02:00
Jenkins for ownCloud	be77e4f57e	[tx-robot] updated from transifex	2015-05-27 02:18:51 -04:00
Jenkins for ownCloud	f344b42aa9	[tx-robot] updated from transifex	2015-05-26 02:19:54 -04:00
Jenkins for ownCloud	90f4a20a50	[tx-robot] updated from transifex	2015-05-26 01:15:28 -04:00
Daniel Molkentin	793130a533	Win32: Make Setup/Update Mutex theme-unique (2/2) Fixes #3272	2015-05-25 21:54:03 +02:00
Vidar Tysse	1ddb162338	Adding Norwegian translation to Client	2015-05-25 21:50:33 +02:00
Daniel Molkentin	070d9d3147	NSIS Installer: Fix Basque, Galician, Slovak, Turkish Not sure when this broke, but those languages could never have worked...	2015-05-25 21:48:21 +02:00
Daniel Molkentin	9b73308edd	NSIS: Add Norwegian (Bokmål) translation	2015-05-25 21:41:23 +02:00
Daniel Molkentin	b46a8239e2	NSIS installer tx: Sort/de-whitespace translation file config	2015-05-25 19:45:02 +02:00
Jenkins for ownCloud	e9d0f5a022	[tx-robot] updated from transifex	2015-05-25 02:18:46 -04:00
Jenkins for ownCloud	5721d8eb64	[tx-robot] updated from transifex	2015-05-24 02:18:48 -04:00
Daniel Molkentin	e708c145fa	Win32: Make Setup/Update Mutex theme-unique Fixes #3272	2015-05-23 09:40:31 +02:00
Jenkins for ownCloud	713beeb2a5	[tx-robot] updated from transifex	2015-05-23 02:18:53 -04:00