[Pkg-owncloud-commits] [owncloud-client] 99/175: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Aug 8 10:36:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 713beeb2a5812f34164b57d363922251655c9889
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Sat May 23 02:18:53 2015 -0400
[tx-robot] updated from transifex
---
translations/client_ca.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_cs.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_de.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_el.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_en.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_es.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_es_AR.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_et.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_eu.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_fa.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_fi.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_fr.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_gl.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_hu.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_it.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_ja.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_nl.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_pl.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_pt.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_pt_BR.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_ru.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_sk.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_sl.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_sr.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_sv.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_th.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_tr.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_uk.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_zh_CN.ts | 75 +++++++++++++++++++++++++++-----------------
translations/client_zh_TW.ts | 75 +++++++++++++++++++++++++++-----------------
30 files changed, 1410 insertions(+), 840 deletions(-)
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index 6e91ef7..b8081ca 100644
--- 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'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>
@@ -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'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>
@@ -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="633"/>
<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 < 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'ha editat localment però és part d'una compartició només de lectura. S'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="599"/>
<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="622"/>
<source>The local file was removed during sync.</source>
<translation>El fitxer local s'ha eliminat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="595"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>El servidor no ha reconegut l'últim fragment. (No hi havia e-Tag)</translation>
</message>
@@ -2435,22 +2440,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construït de la revisió de Git <a href="%1">%2</a> el %4 de %3 usant Qt %5, %6</small></p></translation>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 749e87e..8150566 100644
--- 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>
@@ -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>
@@ -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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 5.4.2.</source>
<translation>Vynucené ukončení procesu při resetu HTTP připojení s Qt < 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="599"/>
<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="622"/>
<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="648"/>
<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,22 +2445,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Verze %1. Více informací na <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Šíří %1 pod licencí GNU General Public License (GPL) Verze 2.0.<br/>%2 a %2 logo jsou registrované známky %1 ve Spojených Státech, ostatních zemích, nebo obojí.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Sestaveno na Git revizi <a href="%1">%2</a> na %3, %4 s použitím Qt %5, %6</small></p></translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index c7e166b..ada1834 100644
--- 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>
@@ -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>
@@ -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>
@@ -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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 5.4.2.</source>
<translation>Auftragsabbruch beim Rücksetzen der HTTP-Verbindung mit QT < 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="599"/>
<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="622"/>
<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="648"/>
<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,22 +2444,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Version %1. Für weitere Informationen besuchen Sie bitte <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Zur Verfügung gestellt durch %1 und lizenziert unter der GNU General Public License (GPL) Version 2.0.<br>%2 und das %2 Logo sind eingetragene Warenzeichen von %1 in den Vereinigten Staaten, anderen Ländern oder beides.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Gebaut von der GIT-Revision <a href="%1">%2</a> auf %3, %4 verwendet Qt %5, %6</small></p></translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index 0a42d61..224aec1 100644
--- 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>
@@ -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>
@@ -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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 5.4.2.</source>
<translation>Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
</message>
@@ -2441,22 +2446,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Έκδοση %1. Για περισσότερες πληροφορίες δείτε <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Πνευματικά δικαιώματα ownCloud, Ανώνυμη Εταιρία</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Διανέμεται από 1% και υπό την άδεια GNU General Public License (GPL) έκδοση 2.0.<br/>% 2 και το 2% το λογότυπο είναι σήματα κατατεθέντα της 1% στις Ηνωμένες Πολιτείες, άλλες χώρες, ή και τα δύο.</ p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Δημιουργήθηκε από την διασκευή Git <a href="%1">%2</a> στο %3, %4 χρησιμοποιώντας Qt %5, %6</small></p></translation>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 50f5bf1..6158d2f 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
@@ -2433,22 +2438,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index db3c485..e2b5766 100644
--- 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>
@@ -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>
@@ -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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 5.4.2.</source>
<translation>Forzar el trabajo en una conexión HTTP, causará un Reset si Qt< 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="599"/>
<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="622"/>
<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="648"/>
<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,22 +2441,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>La versión %1. Para obtener más información, visite<a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, incorporado</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuido por %1 y con licencia GNU General Public License (GPL) Version 2.0.<br/>%2 y el lo de %2 son marcas registradas de %1 en los Estados Unidos y otros países, o ambos.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construido desde la revisión Git <a href="%1">%2</a> en %3, %4 usando Qt %5, %6</small></p></translation>
</message>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index 2582378..728d15d 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -2429,22 +2434,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index 13754f8..1f8107e 100644
--- 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>
@@ -713,22 +713,22 @@ Oled kindel, et soovid seda operatsiooni teostada?</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>Ü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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<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>
@@ -2433,22 +2438,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index 3bdbe69..8a58300 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -2431,22 +2436,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 54e0c09..40e66ac 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -2427,22 +2432,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index 1b7dd27..b6c825a 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -2429,22 +2434,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versio %1. Lisätietoja osoitteessa <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Tekijänoikeus ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 9f32348..01057ec 100644
--- 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'attente de connexion dépassé</translation>
</message>
@@ -1396,7 +1396,7 @@ Il est déconseillé de l'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'attente de connexion dépassé</translation>
</message>
@@ -1404,7 +1404,7 @@ Il est déconseillé de l'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'URL interrogéé a renvoyé une réponse json non valide</translation>
</message>
@@ -1440,22 +1440,22 @@ Il est déconseillé de l'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'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'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'a pas pu être sauvegardé en raison d'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>
@@ -1583,38 +1583,43 @@ Il est déconseillé de l'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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 5.4.2.</source>
<translation>Forcing job abort on HTTP connection reset with Qt < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation>
</message>
@@ -2440,22 +2445,36 @@ Il est déconseillé de l'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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Version %1. Pour plus d'information, visitez <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribué par %1 et sous licence GNU General Public License (GPL) Version 2.0.<br/>%2 et le logo %2 sont des marques enregistrées de %1 aux Etats-Unis, dans d'autres pays, ou les deux.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -2848,27 +2867,27 @@ Il est déconseillé de l'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'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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construit à partir de la révision Git <a href="%1">%2</a> du %3, %4 en utilisant Qt %5, %6.</small><p></translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index ee0bc88..89d5222 100644
--- 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>
@@ -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>
@@ -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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 5.4.2.</source>
<translation>Forzando a interrupción do traballo na conexión HTTP reiniciandoa con Qt <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="599"/>
<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="622"/>
<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="648"/>
<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,22 +2442,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versión %1. Para obter máis información visite <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuído por %1 e licenciado baixo a Licenza Pública Xeral (GPL) GNU Versión 2.0.<br/>Os logotipos %2 e %2 son marcas rexistradas de %1 nos Estados Unidos de Norte América e/ou outros países.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construído a partir de la revisión Git <a href="%1">%2</a> en %3, %4 usando Qt %5, %6</small></p></translation>
</message>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index 2d3bba5..0ea5f23 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -2425,22 +2430,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index b8c5c2e..b8a3ad8 100644
--- 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'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>
@@ -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'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>
@@ -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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 5.4.2.</source>
<translation>Forzare l'interruzione dell'operazione in caso di ripristino della connessione HTTP con Qt < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation>
</message>
@@ -2437,22 +2442,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versione %1. Per ulteriori informazioni vedi <a href="%2">3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuito da %1 e sotto licenza GNU General Public License (GPL) versione 2.0.<br/>%2 e il logo di %2 sono marchi registrati di %1 negli Stati Uniti, in altri paesi o entrambi.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Compilato dalla revisione Git <a href="%1">%2</a> il %3, %4 utilizzando Qt %5, %6</small><p></translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index 9242f09..782b0b4 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しません。(e-tag が存在しません)</translation>
</message>
@@ -2434,22 +2439,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>バージョン %1. 詳細な情報は<a href='%2'>%3</a>を確認してください。</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>%1 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。<br/>%2 及び %2 のロゴはアメリカ合衆国またはその他の国、あるいはその両方における %1 の登録商標です。</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index d0c3c63..0fddcbf 100644
--- 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>
@@ -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>
@@ -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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 5.4.2.</source>
<translation>Forceren job-beëindiging op HTTP verbindingsreset met Qt < 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="599"/>
<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="622"/>
<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="648"/>
<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,22 +2443,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versie %1. Voor meer informatie bezoek <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Gedistribueer door %1 en gelicenseerd onder de GNU General Public License (GPL) Versie 2.0.<br/>%2 en het %2 logo zijn geregistreerde handelsmerken van %1 in de Verenigde Staten, in andere landen of beide.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Gebouwd van Git revisie <a href="%1">%2</a> op %3, %4 gebruik makend van Qt %5, %6</small></p></translation>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index fcc20c6..023beca 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.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 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</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>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>
@@ -1395,7 +1395,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 +1403,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 +1439,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>
@@ -1582,38 +1582,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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<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,22 +2438,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -2842,27 +2861,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 +2902,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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 2331577..7f04935 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 5.4.2.</source>
<translation>A forçar aborto no trabalho de redefinição de conexão HTTP com Qt < 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="599"/>
<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="622"/>
<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="648"/>
<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,22 +2441,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versão %1. Para mais informações visite <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, Incorporado</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuído por %1 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br/>%2 e o logótipo %2 são marcas registadas da %1 nos Estados Unidos, outros países, ou ambos </p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construído a partir da revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p></translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index 0205df0..2bcaa06 100644
--- 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>
@@ -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>
@@ -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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 5.4.2.</source>
<translation>Forçando cancelamento do trabalho em redefinição de conexão HTTP com o Qt < 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="599"/>
<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="622"/>
<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="648"/>
<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,22 +2441,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versão %1. Para mais informações por favor visite <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuído por %1 e licenciado sobre a GNU General Public License (GPL) Versão 2.0.<br/>%2 e o %2 logo são marcas registradas de %1 nos Estados Unidos, outros países ou ambos.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construído a partir de revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p></translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index c2ea08a..82323b4 100644
--- 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>
@@ -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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation>
</message>
@@ -2442,22 +2447,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Версия %1. Для получения дополнительной информации посетите <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Права принадлежат ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Распространяется %1 и лицензировано под GNU General Public License (GPL) Версии 2.0.<br/>Логотипы %2 и %2 являются зарегистрированной торговой маркой %1 в США и/или других странах.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Собрано исходников Git версии <a href="%1">%2</a> на %3, %4 используя Qt %5, %6</small></p></translation>
</message>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index b0ea810..0f66e7e 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.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 @@ Ste si istý, že chcete uskutočniť danú operáciu?</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>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>
@@ -1395,7 +1395,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 +1403,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,22 +1439,22 @@ 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"/>
</message>
@@ -1582,38 +1582,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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<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>
@@ -2439,22 +2444,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Verzia %1. Pre viac informácií choďte na <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Copyright ownCloud, Incorporated</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Šíri %1 pod licenciou GNU General Public License (GPL) Verzia 2.0.<br/>%2 a %2 logo sú registrované známky %1 v USA, ostatných krajinách, alebo oboje.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -2847,27 +2866,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,7 +2907,7 @@ 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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index c565aad..9d7f7ae 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<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,22 +2438,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Različica %1. Za več podrobnosti si oglejte <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Programski paket objavlja %1 pod pogoji Splošnega javnega dovoljenja GNU (GNU General Public License - GPL), različice 2.0.<br>%2 in logotip %2 sta blagovni znamki %1 v Združenih državah, drugih državah ali oboje.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index 95855f0..9d5ad2e 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 5.4.2.</source>
<translation>Присили прекид посла код прекида ХТТП везе са КуТ < 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="599"/>
<source>Poll URL missing</source>
<translation>Адреса упита недостаје</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер није потврдио последње парче. (није било е-ознаке)</translation>
</message>
@@ -2440,22 +2445,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Верзија %1. За више информација посетите <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Ауторска права оунКлауд (ownCloud), корпорација</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Дистрибуира %1 под ГНУ општом јавном лиценцом (ОЈЛ) верзија 2.0.<br/>%2 и %2 лого су регистроване марке %1 у САД, другим земљама или обоје</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Направљено од ГИТ ревизије <a href="%1">%2</a> %3, %4 користећи КуТ %5, %6</small></p></translation>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index fc06d36..32693a6 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<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,22 +2438,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Version %1. För mer information vänligen besök <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribueras av %1 och licenserad under GNU General Public License (GPL) Version 2.0.<br/>%2 och %2 logotyp är registrerade varumärken av %1 i Förenta Staterna, andra länder, eller både och.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index bf30ca5..fb36601 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -2425,22 +2430,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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 type="unfinished"/>
</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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 5c064ef..951b175 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.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 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</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>Sunucudan E-Tag alınamadı, Vekil Sunucu/Ağ Geçidi'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>
@@ -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'sinden geçersiz JSON yanıtı</translation>
</message>
@@ -1439,22 +1439,22 @@ 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"/>
</message>
@@ -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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 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>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="599"/>
<source>Poll URL missing</source>
<translation>Getirme URL'si eksik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="569"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="622"/>
<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="648"/>
<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>
@@ -2437,22 +2442,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Sürüm %1. Daha fazla bilgi için lütfen <a href='%2'>%3</a> adresini ziyaret edin.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p>Telif Hakkı ownCloud Anonim Şirketi</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>%1 tarafından dağıtılmış ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.<br/>%2 ve %2 logoları ABD ve/veya diğer ülkelerde %1 tescili markalarıdır.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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,7 +2905,7 @@ 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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small> <a href="%1">%2</a> numaralı Git revizyonunundan oluşturuldu %3, %4 Qt kullanılıyor %5, %6</small></p></translation>
</message>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index 2dffa04..f3f7489 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.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>
@@ -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>Тайм-аут З'єднання</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,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>Файл %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>
@@ -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 type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="250"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер не зміг підтвердити останній відрізок даних. (Були відсутні e-tag)</translation>
</message>
@@ -2439,22 +2444,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Версія %1. Для отримання більш детальної інформації, будь ласка, відвідайте <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation><p> Права належать ownCloud, Incorporated </p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Поширюється через %1 і під ліцензією GNU General Public License (GPL) версії 2.0<br/>%2 логотип %2 є зареєстрованими торговими марками %1 у Сполучених Штатах та інших країнах, або обох.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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,7 +2907,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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 1d298a5..cf9bb71 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>服务器找不到上一分块。（找不到 E-tag）</translation>
</message>
@@ -2434,22 +2439,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>版本 %1。详情请见 <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index ac94f0d..37bdb3b 100644
--- 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>
@@ -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>
@@ -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="633"/>
<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 < 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="599"/>
<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="622"/>
<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="648"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -2425,22 +2430,36 @@ 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><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="269"/>
+ <location filename="../src/libsync/theme.cpp" line="274"/>
<source><p>Copyright ownCloud, Incorporated</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="270"/>
+ <location filename="../src/libsync/theme.cpp" line="275"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></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>
<location filename="../src/gui/owncloudgui.cpp" line="221"/>
@@ -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><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list