[Pkg-owncloud-commits] [owncloud-client] 116/171: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Feb 17 09:36:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.
commit 81204ee0dbd72c5962044516cd672360d06f3b48
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Sat Jan 16 02:18:48 2016 -0500
[tx-robot] updated from transifex
---
translations/client_ca.ts | 22 +++++++++++-----------
translations/client_cs.ts | 22 +++++++++++-----------
translations/client_de.ts | 22 +++++++++++-----------
translations/client_el.ts | 22 +++++++++++-----------
translations/client_en.ts | 22 +++++++++++-----------
translations/client_es.ts | 22 +++++++++++-----------
translations/client_es_AR.ts | 22 +++++++++++-----------
translations/client_et.ts | 22 +++++++++++-----------
translations/client_eu.ts | 22 +++++++++++-----------
translations/client_fa.ts | 22 +++++++++++-----------
translations/client_fi.ts | 22 +++++++++++-----------
translations/client_fr.ts | 22 +++++++++++-----------
translations/client_gl.ts | 22 +++++++++++-----------
translations/client_hu.ts | 22 +++++++++++-----------
translations/client_it.ts | 22 +++++++++++-----------
translations/client_ja.ts | 22 +++++++++++-----------
translations/client_nb_NO.ts | 22 +++++++++++-----------
translations/client_nl.ts | 30 +++++++++++++++---------------
translations/client_pl.ts | 22 +++++++++++-----------
translations/client_pt.ts | 22 +++++++++++-----------
translations/client_pt_BR.ts | 22 +++++++++++-----------
translations/client_ru.ts | 22 +++++++++++-----------
translations/client_sk.ts | 22 +++++++++++-----------
translations/client_sl.ts | 22 +++++++++++-----------
translations/client_sr.ts | 22 +++++++++++-----------
translations/client_sv.ts | 22 +++++++++++-----------
translations/client_th.ts | 22 +++++++++++-----------
translations/client_tr.ts | 22 +++++++++++-----------
translations/client_uk.ts | 22 +++++++++++-----------
translations/client_zh_CN.ts | 22 +++++++++++-----------
translations/client_zh_TW.ts | 22 +++++++++++-----------
31 files changed, 345 insertions(+), 345 deletions(-)
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index cc8b1e0..032ca88 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -1821,7 +1821,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Temps de connexió excedit</translation>
</message>
@@ -1829,7 +1829,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1981,43 +1981,43 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Fitxer eliminat</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 5ac81ee..a3ee0c4 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -1824,7 +1824,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Čas spojení vypršel</translation>
</message>
@@ -1832,7 +1832,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Neplatná JSON odpověď z adresy URL</translation>
</message>
@@ -1984,43 +1984,43 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Soubor odebrán</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Místní soubor se během synchronizace změnil. </translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Chybí adresa URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index afa8062..b5a525e 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -1823,7 +1823,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -1831,7 +1831,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Ungültige JSON-Antwort von der Poll-URL</translation>
</message>
@@ -1983,43 +1983,43 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Datei gelöscht</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Poll-URL fehlt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index b60ce9b..e45396e 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -1825,7 +1825,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
</message>
@@ -1833,7 +1833,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Λανθασμένη απάντηση JSON από την ιστοσελίδα poll</translation>
</message>
@@ -1985,43 +1985,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Το αρχείο αφαιρέθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Η διεύθυνση poll URL λείπει</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index e2d2e26..265525e 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -1817,7 +1817,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -1825,7 +1825,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"></translation>
</message>
@@ -1977,43 +1977,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 8176204..16cb632 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -1823,7 +1823,7 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -1831,7 +1831,7 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Respuesta JSON invalida desde URL</translation>
</message>
@@ -1983,43 +1983,43 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Archivo eliminado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Archivo local cambió durante la sincronización. Será actualizado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Falta la URL de la encuesta</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>El archivo local ha sido eliminado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>El servidor no reconoció la última parte. (No había una e-tag presente)</translation>
</message>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index 3895a71..263524b 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -1812,7 +1812,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1820,7 +1820,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1972,43 +1972,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index 94bc0a6..b296f9d 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -1814,7 +1814,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -1822,7 +1822,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1974,43 +1974,43 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Fail eemaldatud</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Kohalik fail muutus sünkroniseeringu käigus. See taastakse.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Küsitluse URL puudub</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index d57c43b..8961b2b 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -1820,7 +1820,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Konexioa denboraz kanpo</translation>
</message>
@@ -1828,7 +1828,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1980,43 +1980,43 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Fitxategia Ezabatua</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 583251d..81fd1ef 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -1813,7 +1813,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>تایم اوت اتصال</translation>
</message>
@@ -1821,7 +1821,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1973,43 +1973,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>فایل حذف شد</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>فایل محلی در حین همگامسازی تغییر کرده است.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>فایل محلی در حین همگامسازی حذف شده است.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index 20d2989..bdf2c46 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -1821,7 +1821,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -1829,7 +1829,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1981,43 +1981,43 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Tiedosto poistettu</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index fda969f..b03f241 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -1824,7 +1824,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Délai d'attente de connexion dépassé</translation>
</message>
@@ -1832,7 +1832,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>L'URL interrogéé a renvoyé une réponse json non valide</translation>
</message>
@@ -1984,43 +1984,43 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Fichier supprimé</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Fichier local modifié pendant la synchronisation. Elle va reprendre. </translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Arrêt forcé du job après réinitialisation de connexion HTTP avec Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>URL de sondage manquante</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Le serveur n'a pas confirmé la réception du dernier morceau. (Aucun e-tag n'était présent).</translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index d41f9d3..c6d1220 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -1820,7 +1820,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -1828,7 +1828,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>O URL requirido devolveu unha resposta JSON incorrecta</translation>
</message>
@@ -1980,43 +1980,43 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Ficheiro retirado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>O ficheiro local cambiou durante a sincronización. Retomase.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Non se atopa o URL requirido</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index b19ef10..b64103f 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -1817,7 +1817,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Kapcsolat időtúllépés</translation>
</message>
@@ -1825,7 +1825,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1977,43 +1977,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Fájl törölve</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>A helyi fájl el lett távolítva a szinkronizálás alatt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 182f33c..d326f8f 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -1823,7 +1823,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -1831,7 +1831,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Risposta JSON non valida dall'URL di richiesta</translation>
</message>
@@ -1983,43 +1983,43 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>File rimosso</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>URL di richiesta mancante</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index d7c0453..4d9b875 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -1822,7 +1822,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -1830,7 +1830,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>不正なJSONがポーリングURLから返りました</translation>
</message>
@@ -1982,43 +1982,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>ファイルを削除しました</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>ローカルファイルが同期中に変更されました。再開されます。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>5.4.2 以下のQt でHTTP 接続リセットが強制終了されました</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>ポーリングURLがありません</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>ローカルファイルを同期中に削除します。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>サーバーは最終チャンクを認識しませんでした。(e-tag が存在しませんでした)</translation>
</message>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 37ef686..0b5c5a5 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -1824,7 +1824,7 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Tidsavbrudd ved tilkobling</translation>
</message>
@@ -1832,7 +1832,7 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Ugyldig JSON-svar fra forespørsels-URL</translation>
</message>
@@ -1984,43 +1984,43 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Fil fjernet</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokal fil endret under synkronisering. Den vil gjenopptas.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil endret under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Tvinger avbryting av jobb ved HTTP connection reset med Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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 ble redigert lokalt men er en del av en deling med lesetilgang. Den er blitt gjenopprettet og din endring er i konfliktfilen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Forespørsels-URL mangler</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>Den lokale filen ble fjernet under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Serveren godtok ikke den siste deloverføringen. (Ingen e-tag var tilstede)</translation>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 2cc871d..268059a 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -1825,7 +1825,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -1833,7 +1833,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Ongeldig JSON antwoord van de peilingen URL</translation>
</message>
@@ -1985,43 +1985,43 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Bestand verwijderd</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>URL peiling ontbreekt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
</message>
@@ -2314,7 +2314,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="91"/>
<source>Set &expiration date</source>
- <translation>Instellen &vervaldatum</translation>
+ <translation>Stel &vervaldatum in</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="115"/>
@@ -2324,7 +2324,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="164"/>
<source>Copy &link</source>
- <translation>Kopieëren &link</translation>
+ <translation>Kopiëren &link</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="188"/>
@@ -2361,7 +2361,7 @@ We adviseren deze site niet te gebruiken.</translation>
<location filename="../src/gui/sharelinkwidget.cpp" line="494"/>
<location filename="../src/gui/sharelinkwidget.cpp" line="495"/>
<source>&Share link</source>
- <translation>$Delen link</translation>
+ <translation>&Deel link</translation>
</message>
</context>
<context>
@@ -2379,7 +2379,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/shareusergroupwidget.cpp" line="217"/>
<source>No results for '%1'</source>
- <translation type="unfinished"/>
+ <translation>Geen resultaten voor '%1'</translation>
</message>
</context>
<context>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index 28a1107..b43c7e0 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -1815,7 +1815,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -1823,7 +1823,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1975,43 +1975,43 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Usunięto plik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 7c063dc..030e0bf 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -1823,7 +1823,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou</translation>
</message>
@@ -1831,7 +1831,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Resposta JSON inválida do URL poll</translation>
</message>
@@ -1983,43 +1983,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Ficheiro Eliminado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>O ficheiro local foi alterado durante a sincronização. Vai ser finalizado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>URL poll em falta</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index e0a8f3c..5dfc999 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -1824,7 +1824,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
@@ -1832,7 +1832,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Resposta JSON inválida a partir do conjunto de URL</translation>
</message>
@@ -1984,43 +1984,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Arquivo Removido</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Arquivo local alterado durante a sincronização. Ele será retomado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Faltando conjunto de URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>O servidor não reconheceu o último pedaço. (Nenhuma e-tag estava presente)</translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index b7e1952..8201c1a 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -1823,7 +1823,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Время ожидания подключения истекло</translation>
</message>
@@ -1831,7 +1831,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Не правильный JSON ответ на сформированный URL</translation>
</message>
@@ -1983,43 +1983,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Файл Перемещён</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локальный файл изменился в процессе синхронизации. Операция будет возобновлена.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Локальный файл изменился в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Не хватает сформированного URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>Локальный файл был удалён в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation>
</message>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index 6afcb63..ba4027c 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -1818,7 +1818,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Spojenie vypršalo</translation>
</message>
@@ -1826,7 +1826,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Neplatná JSON odpoveď z URL adresy</translation>
</message>
@@ -1978,43 +1978,43 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Súbor zmazaný</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokálny súbor bol zmenený počas synchronizácie. Bude obnovený.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Vynútené ukončenie procesu pri resete HTTP pripojení s Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Chýba URL adresa</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index c678db9..6becbbc 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -1815,7 +1815,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Povezava časovno pretekla</translation>
</message>
@@ -1823,7 +1823,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1975,43 +1975,43 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Datoteka je odstranjena</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena. Usklajena bo, ko bo shranjena.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index af5e2c3..ef6dbed 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -1819,7 +1819,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Веза је истекла</translation>
</message>
@@ -1827,7 +1827,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Неисправан ЈСОН одговор са адресе упита</translation>
</message>
@@ -1979,43 +1979,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Фајл уклоњен</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локални фајл је измењен током синхронизације. Биће настављена.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Локални фајл измењен током синхронизације.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Адреса упита недостаје</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>Локални фајл је уклоњен током синхронизације.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 71922e8..1ef4a8f 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -1821,7 +1821,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -1829,7 +1829,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1981,43 +1981,43 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Filen Raderad</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index fe6a7fe..1ad67c5 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -1823,7 +1823,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>หมดเวลาการเชื่อมต่อ</translation>
</message>
@@ -1831,7 +1831,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>ตอบกลับ JSON ไม่ถูกต้องจาก URL แบบสำรวจความคิดเห็น</translation>
</message>
@@ -1983,43 +1983,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>ไฟล์ถูกลบไปแล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงในระหว่างการซิงค์ มันจะกลับมา</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>URL แบบสำรวจความคิดเห็นหายไป</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>ไฟล์ต้นทางถูกลบออกในระหว่างการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>เซิร์ฟเวอร์ไม่ยอมรับส่วนสุดท้าย (ไม่มี e-tag ในปัจจุบัน)</translation>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index cad3ffd..85b8838 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -1823,7 +1823,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Bağlantı Zaman Aşımı</translation>
</message>
@@ -1831,7 +1831,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Getirme URL'sinden geçersiz JSON yanıtı</translation>
</message>
@@ -1983,43 +1983,43 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Dosya Kaldırıldı</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Eşitleme sırasında yerel dosya değişti. Devam edilecek.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<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="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Qt < 5.4.2 ile HTTP bağlantı sıfırlamasında görev iptali zorlanıyor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Getirme URL'si eksik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<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="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index 28370f6..a93bf9f 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -1814,7 +1814,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>Тайм-аут З'єднання</translation>
</message>
@@ -1822,7 +1822,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Неправильна JSON відповідь на сформований URL</translation>
</message>
@@ -1974,43 +1974,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>Файл переміщено</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локальний файл змінився під час синхронізації. Його буде відновлено.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>Локальний файл змінився під час синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>Не вистачає сформованого URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>Локальний файл було видалено під час синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 997c04b..d9c4936 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -1813,7 +1813,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -1821,7 +1821,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>推送 URL 传来的 JSON 无效</translation>
</message>
@@ -1973,43 +1973,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>已移除文件</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>缺少轮询 URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>本地文件在同步时已删除。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index f1e6dd8..edc45eb 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -1824,7 +1824,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="112"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="101"/>
<source>Connection Timeout</source>
<translation>連線逾時</translation>
</message>
@@ -1832,7 +1832,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="169"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="158"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>不合法的JSON資訊從URL中回傳</translation>
</message>
@@ -1984,43 +1984,43 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="299"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="288"/>
<source>File Removed</source>
<translation>檔案已移除</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="311"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="300"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>本地端的檔案在同步的過程中被更改，此檔案將會被還原。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="323"/>
- <location filename="../src/libsync/propagateupload.cpp" line="704"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="312"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="693"/>
<source>Local file changed during sync.</source>
<translation>本地端的檔案在同步過程中被更改。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="620"/>
<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="639"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="628"/>
<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="670"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="659"/>
<source>Poll URL missing</source>
<translation>缺少輪詢的超連結</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="693"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="682"/>
<source>The local file was removed during sync.</source>
<translation>本地端的檔案在同步過程中被刪除。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="719"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="708"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>伺服器不承認檔案的最後一個分割檔。(e-tag不存在)</translation>
</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