[Pkg-owncloud-commits] [owncloud-client] 09/175: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Aug 8 10:36:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 352c2957b282bee7802b37576a84fd139d5ac781
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Thu May 7 02:18:55 2015 -0400
[tx-robot] updated from transifex
---
translations/client_ca.ts | 37 +++++++++++++++++++++----------------
translations/client_cs.ts | 37 +++++++++++++++++++++----------------
translations/client_de.ts | 37 +++++++++++++++++++++----------------
translations/client_el.ts | 37 +++++++++++++++++++++----------------
translations/client_en.ts | 37 +++++++++++++++++++++----------------
translations/client_es.ts | 37 +++++++++++++++++++++----------------
translations/client_es_AR.ts | 37 +++++++++++++++++++++----------------
translations/client_et.ts | 37 +++++++++++++++++++++----------------
translations/client_eu.ts | 37 +++++++++++++++++++++----------------
translations/client_fa.ts | 37 +++++++++++++++++++++----------------
translations/client_fi.ts | 37 +++++++++++++++++++++----------------
translations/client_fr.ts | 37 +++++++++++++++++++++----------------
translations/client_gl.ts | 37 +++++++++++++++++++++----------------
translations/client_hu.ts | 37 +++++++++++++++++++++----------------
translations/client_it.ts | 37 +++++++++++++++++++++----------------
translations/client_ja.ts | 37 +++++++++++++++++++++----------------
translations/client_nl.ts | 37 +++++++++++++++++++++----------------
translations/client_pl.ts | 37 +++++++++++++++++++++----------------
translations/client_pt.ts | 37 +++++++++++++++++++++----------------
translations/client_pt_BR.ts | 37 +++++++++++++++++++++----------------
translations/client_ru.ts | 37 +++++++++++++++++++++----------------
translations/client_sk.ts | 37 +++++++++++++++++++++----------------
translations/client_sl.ts | 37 +++++++++++++++++++++----------------
translations/client_sr.ts | 37 +++++++++++++++++++++----------------
translations/client_sv.ts | 37 +++++++++++++++++++++----------------
translations/client_th.ts | 37 +++++++++++++++++++++----------------
translations/client_tr.ts | 37 +++++++++++++++++++++----------------
translations/client_uk.ts | 37 +++++++++++++++++++++----------------
translations/client_zh_CN.ts | 37 +++++++++++++++++++++----------------
translations/client_zh_TW.ts | 37 +++++++++++++++++++++----------------
30 files changed, 630 insertions(+), 480 deletions(-)
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index 5055f9e..9bb8d04 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -815,37 +815,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Els elements marcats també s'eliminaran si prevenen l'eliminació d'una carpeta. Això és útil per metadades.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>No s'ha pogut obrir el fitxer</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>No es poden desar els canvis a '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Afegeix una plantilla per ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Afegeix una nova plantilla d'ignorats:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Edita el partó d'ignorats</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Edita el patró d'ignorats:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Això es proporciona completament pel sistema a '%1' i no es pot modificar en aquesta vista.</translation>
</message>
@@ -1389,7 +1389,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Temps de connexió excedit</translation>
</message>
@@ -1397,7 +1397,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1571,33 +1571,38 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>El servidor no ha reconegut l'últim fragment. (No hi havia e-Tag)</translation>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 1f63184..474b7a3 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Zvolené položky budou smazány také v případě, že brání smazání adresáře. To je užitečné u meta dat.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Nepodařilo se otevřít soubor</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Nelze zapsat změny do '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Přidat masku ignorovaných</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Přidat novou masku ignorovaných souborů:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Upravit masku ignorovaných</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Upravit masku ignorovaných:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Tato položka je poskytnuta systémem na '%1' a nemůže být v tomto pohledu změněna.</translation>
</message>
@@ -1388,7 +1388,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Čas spojení vypršel</translation>
</message>
@@ -1396,7 +1396,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Neplatná JSON odpověď z adresy URL</translation>
</message>
@@ -1570,33 +1570,38 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Soubor odebrán</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>Chybí adresa URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 0d54cb9..cde733b 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -815,37 +815,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Verzeichnis verhindern. Dies ist nützlich für Metadaten.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Datei konnte nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Konnte Änderungen nicht in '%1' schreiben.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Ignoriermuster hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Neues Ignoriermuster hinzufügen:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Ignoriermuster bearbeiten</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Ignoriermuster bearbeiten:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Dieser Eintrag wird vom System auf '%1' bereitgestellt und kann in dieser Ansicht nicht geändert werden.</translation>
</message>
@@ -1388,7 +1388,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -1396,7 +1396,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Ungültige JSON-Antwort von der Poll-URL</translation>
</message>
@@ -1570,33 +1570,38 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Datei gelöscht</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>Poll-URL fehlt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index ad6a4c9..ab3421f 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -815,37 +815,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Τα επιλεγμένα στοιχεία επίσης θα διαγράφονται εάν εμποδίζουν την αφαίρεση ενός καταλόγου αρχείων. Αυτό είναι χρήσιμο για μετα-δεδομένα.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Αδυναμία ανοίγματος αρχείου</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Αδυναμία εγγραφής αλλαγών στο '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Προσθήκη Προτύπου Αγνόησης</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Προσθήκη νέου προτύπου αγνόησης:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Επεξεργασία Προτύπου Αγνόησης</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Επεξεργασία προτύπου αγνόησης:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Αυτή η είσοδος παρέχεται από το σύστημα στο '%1' και δεν μπορεί να τροποποιηθεί σε αυτή την προβολή.</translation>
</message>
@@ -1389,7 +1389,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
</message>
@@ -1397,7 +1397,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Λανθασμένη απάντηση JSON από την ιστοσελίδα poll</translation>
</message>
@@ -1571,33 +1571,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Το αρχείο αφαιρέθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>Η διεύθυνση poll URL λείπει</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 37e40ab..372f2e8 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -811,37 +811,37 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"></translation>
</message>
@@ -1383,7 +1383,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -1391,7 +1391,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"></translation>
</message>
@@ -1565,33 +1565,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 6d16f17..b237e7a 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Los elementos marcados también se eliminarán si impiden la eliminación de algún directorio. Esto es útil para los metadatos</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>No se pudo abrir el archivo</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>No se pueden guardar cambios en '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Añadir patrón para ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Añadir nuevo patrón para ignorar:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Editar patrón de ignorados</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Editar patrón de ignorados:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Esta entrada es proporcionada por el sistema en '%1' y no puede ser modificada en esta vista.</translation>
</message>
@@ -1387,7 +1387,7 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -1395,7 +1395,7 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Respuesta JSON invalida desde URL</translation>
</message>
@@ -1569,33 +1569,38 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Archivo eliminado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>URL de encuesta faltante</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation>El archivo local fue eliminado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>El servidor no reconoció la última parte. (No había una e-tag presente.)</translation>
</message>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index f0cfda1..474538c 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -813,37 +813,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Los elementos marcados también se borrarán si impiden la eliminación de algún directorio. Esto es útil para metadatos.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>No se pudo abrir el archivo</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>No se pueden guardar cambios en '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Agregar patrón a ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Añadir nuevo patrón a ignorar:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Esta entrada es provista por el sistema en '%1' y no puede ser modificada en esta vista.</translation>
</message>
@@ -1385,7 +1385,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1393,7 +1393,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1567,33 +1567,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index 63ee74b..25d5201 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Ühtlasi kustutatakse märgitud üksused, kui need takistavad kataloogi kustutamist. See on kasulik meta-andmetele.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Ei suutunud avada faili</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Ei saa kirjutada muudatusi '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Lisa ignoreerimise muster</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Lisa uus ignoreerimise muster:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Muuda ignoreerimis mustrit</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Muuda ignoreerimis mustrit:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Selle kirje on pakkunud süsteem '%1' ning seda ei saa antud vaates muuta.</translation>
</message>
@@ -1387,7 +1387,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -1395,7 +1395,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1569,33 +1569,38 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Fail eemaldatud</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Server ei tunnistanud viimast tükki. (E-silt puudus).</translation>
</message>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index e81f8de..12e6c10 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta datuentzat interesgarria da.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Ezin izan da fitxategia ireki</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Ezin izan dira aldaketa idatzi hemen '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Gehitu Baztertzeko Eredua</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Gehitu baztertzeko eredu berria:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Editatu Baztertzeko Eredua</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Editatu baztertzeko eredua</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"/>
</message>
@@ -1387,7 +1387,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Konexioa denboraz kanpo</translation>
</message>
@@ -1395,7 +1395,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1569,33 +1569,38 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 546351a..4cbdb47 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -811,37 +811,37 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>ویرایش الگوی نادیده گرفته شده</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>ویرایش الگوی نادیده گرفته شده:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"/>
</message>
@@ -1383,7 +1383,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>تایم اوت اتصال</translation>
</message>
@@ -1391,7 +1391,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1565,33 +1565,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index 60c2970..36ce89f 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -810,37 +810,37 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Tiedoston avaaminen ei onnistunut</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Lisää ohituskaava</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Lisää uusi ohituskaava:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"/>
</message>
@@ -1383,7 +1383,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -1391,7 +1391,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1565,33 +1565,38 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 08c31ed..78e25bb 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Les motifs cochés seront également supprimés s'ils empêchent la suppression d'un dossier. Cela est utile pour les meta-données.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Impossible d'ouvrir le fichier</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Impossible d'écrire les modifications sur '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Ajouter un motif à ignorer</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Ajoutez un nouveau motif à ignorer :</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Modifier le motif</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Éditer le motif :</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Cette entrée est fournie par le système dans '%1' et ne peut être modifiée dans cette vue.</translation>
</message>
@@ -1388,7 +1388,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Délai d'attente de connexion dépassé</translation>
</message>
@@ -1396,7 +1396,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>L'URL interrogéé a renvoyé une réponse json non valide</translation>
</message>
@@ -1570,33 +1570,38 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Fichier supprimé</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>URL de sondage manquante</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 6ce9925..bf2161f 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Isto é útil para os metadatos.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Non foi posíbel abrir o ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Non é posíbel escribir os cambios en «%1».</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Engadir o patrón a ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Engadir un novo patrón a ignorar:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Editar o patrón a ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Editar o patrón a ignorar:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Esta entrada é fornecida polo sistema en «%1» e non pode ser modificado nesta vista.</translation>
</message>
@@ -1388,7 +1388,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -1396,7 +1396,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>O URL requirido devolveu unha resposta JSON incorrecta</translation>
</message>
@@ -1570,33 +1570,38 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Ficheiro retirado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>Non se atopa o URL requirido</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presente)</translation>
</message>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index 6f9a788..cf07b98 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -809,37 +809,37 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Nem sikerült a fájl megnyitása</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"/>
</message>
@@ -1381,7 +1381,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1389,7 +1389,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1563,33 +1563,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 5bd77b0..d7c7064 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di una cartella. Utile per i metadati.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Impossibile aprire il file</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Impossibile scrivere le modifiche in '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Aggiungi modello Ignora</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Aggiungi un nuovo modello di esclusione:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Modifica modello Ignora</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Modifica modello Ignora:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Questa voce è fornita dal sistema in '%1' e non può essere modificata in questa vista.</translation>
</message>
@@ -1387,7 +1387,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -1395,7 +1395,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Risposta JSON non valida dall'URL di richiesta</translation>
</message>
@@ -1569,33 +1569,38 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>File rimosso</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>URL di richiesta mancante</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index f685ecc..d06387c 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
パターンによってディレクトリを削除から除外する場合は，選択された項目も削除されます。これはメタデータでの利用において有用な機能です。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>ファイルが開けませんでした</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>'%1'を更新できません。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>除外するファイルパターンを追加</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>除外するファイルパターンを新しく追加:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>除外するファイルパターンを編集</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>除外するファイルパターンを編集:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>このエントリーは、システム '%1' から提供されています。この画面では変更できません。</translation>
</message>
@@ -1386,7 +1386,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -1394,7 +1394,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>不正なJSONがポーリングURLから返りました</translation>
</message>
@@ -1568,33 +1568,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>ファイルを削除しました</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>ポーリングURLがありません</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation>ローカルファイルを同期中に削除します。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しません。(e-tag が存在しません)</translation>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 93063cc..f19f40e 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat een folder verwijderd wordt. Dit is nuttig voor metadata.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Kon het bestand niet openen</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Er kunnen geen wijzigingen worden geschreven naar %1</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Toevoegen negeerpatroon</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Voeg nieuw negeerpatroon toe:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Bewerk negeerpatroon</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Bewerk negeerpatroon:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Deze entry is door het systeem geleverd op '%1' en kan niet worden aangepast in deze sessie.</translation>
</message>
@@ -1388,7 +1388,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -1396,7 +1396,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Ongeldig JSON antwoord van de peilingen URL</translation>
</message>
@@ -1570,33 +1570,38 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Bestand verwijderd</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>URL peiling ontbreekt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index ea11318..1ec5e80 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w usunięciu katalogu. Jest to przydatne dla meta data.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Nie można otworzyć plików</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Nie mogę zapisać zmian do '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Dodaj ignorowany</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Dodaj nowy ignorowany:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Edytuj ignorowane</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Edytuj ignorowane:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Ten wpis jest podawany przez system w '%1' i nie może być zmieniony w tym widoku.</translation>
</message>
@@ -1387,7 +1387,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -1395,7 +1395,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1569,33 +1569,38 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Usunięto plik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 293fbb6..c19d7a5 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -813,37 +813,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Itens verificados também serão removidos se evitarem que um diretório seja removido. Isto é útil para os metadados.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Não foi possível abrir o ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Não foi possível escrever as alterações para '%1'</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Adicione regra para ignorar ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Adicione nova regra para ignorar ficheiros:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Editar regra</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Editar regra:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Esta entrada é fornecida pelo sistema em '%1' e não pode ser modificada nesta vista.</translation>
</message>
@@ -1385,7 +1385,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou</translation>
</message>
@@ -1393,7 +1393,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Resposta JSON inválida do URL poll</translation>
</message>
@@ -1567,33 +1567,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Ficheiro Eliminado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>URL poll em falta</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index f341264..1dffb47 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Itens marcados também serão excluídos se estiverem impedindo a remoção de um diretório. Isso é útil para metadados.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Não foi possível abrir o arquivo</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Não é possível gravar as alterações em '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Adicionar Ignorar Padrão</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Adicionar um novo padrão ignorar:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Editar Ignorar Padrão</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Editar Ignorar Padrão:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Esta entrada é fornecida pelo sistema em '%1' e não pode ser modificado aqui.</translation>
</message>
@@ -1387,7 +1387,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
@@ -1395,7 +1395,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Resposta JSON inválida a partir do conjunto de URL</translation>
</message>
@@ -1569,33 +1569,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Arquivo Removido</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>Faltando conjunto de URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 3b40a4c..5848b15 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Выбранные элементы также будут удалены если они не позволят удалить каталог. Это полезно для метаданных.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Невозможно открыть файл</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Невозможно записать изменения в '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Добавить шаблон игнорирования</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Добавить новый шаблон игнорирования:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Изменить шаблон игнорирования</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Изменить шаблон игнорирования:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Эта запись сделана системой в '%1' и не может быть изменена в этом представлении.</translation>
</message>
@@ -1388,7 +1388,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Время ожидания подключения истекло</translation>
</message>
@@ -1396,7 +1396,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Не правильный JSON ответ на сформированный URL</translation>
</message>
@@ -1570,33 +1570,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Файл Перемещён</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>Локальный файл изменился в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>Не хватает сформированного URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation>Локальный файл был удалён в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation>
</message>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index fec7661..4175ac2 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri odstraňovaní. Toto je užitočné pre metadáta.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Nemožno otvoriť súbor</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Nemožno zapísať zmeny do '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Pridať vzor ignorovaného súboru</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Pridať nový vzor ignorovaného súboru:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Úprava vzorov súborov pre vynechanie</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Uprav vzor súboru pre vynechanie:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Táto položka je poskytovaná systémom na '%1' a nesmie byť modifikovaná v tomto zobrazení.</translation>
</message>
@@ -1387,7 +1387,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Spojenie vypršalo</translation>
</message>
@@ -1395,7 +1395,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Neplatná JSON odpoveď z URL adresy</translation>
</message>
@@ -1569,33 +1569,38 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Súbor zmazaný</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>Chýba URL adresa</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil posledný kúsok. (Nebol prítomný e-tag)</translation>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index b9b88b6..0cf2735 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje mape. Ta možnost je uporabna za metapodatke.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Datoteke ni mogoče odpreti</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Ni mogoče zapisati sprememb v '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Dodaj vzorec za izpuščanje</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Dodaj nov vzorec za izpuščanje:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Uredi vzorec za izpuščanje</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Uredi vzorec za izpuščanje:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Ta vnos je ponujen pri '%1' in ga v tem pogledu ni mogoče spreminjati.</translation>
</message>
@@ -1387,7 +1387,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Povezava časovno pretekla</translation>
</message>
@@ -1395,7 +1395,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1569,33 +1569,38 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Datoteka je odstranjena</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Strežnik ni prepoznal zadnjega niza besed. (ni določenih e-oznak)</translation>
</message>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index 543acc9..bc779d2 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Означене ставке ће такође бити уклоњене ако заостану приликом уклањања директоријума. Ово је корисно за мета-податке.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Не могу да отворим фајл</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Не могу да упишем измене у „%1“</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Додавање шаблона за игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Додајте нови шаблон за игнорисање:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Уређивање шаблона за игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Уредите шаблон за игнорисање:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Овај унос је системски из „%1“ и не може се овде изменити.</translation>
</message>
@@ -1388,7 +1388,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Веза је истекла</translation>
</message>
@@ -1396,7 +1396,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Неисправан ЈСОН одговор са адресе упита</translation>
</message>
@@ -1570,33 +1570,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Фајл уклоњен</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>Локални фајл измењен током синхронизације.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>Адреса упита недостаје</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation>Локални фајл је уклоњен током синхронизације.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер није потврдио последње парче. (није било е-ознаке)</translation>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index c79677f..7e03658 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort. Detta är användbart för meta-data.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Kunde inte öppna fil</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Kan inte skriva förändringar till '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Lägg till synk-filter</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Lägg till ett nytt synk-filter:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Ändra synk-filter</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Ändra synk-filter:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Denna post hanteras av systemet på '%1' och kan inte ändras här.</translation>
</message>
@@ -1387,7 +1387,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -1395,7 +1395,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1569,33 +1569,38 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Filen Raderad</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Servern bekräftade inte det sista fil-fragmentet (Ingen e-tag fanns tillgänglig)</translation>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index aef83fb..73b6aa1 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -809,37 +809,37 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"/>
</message>
@@ -1381,7 +1381,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1389,7 +1389,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1563,33 +1563,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 0a863bc..771aac2 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir. Bu, üst veri için kullanışlıdır.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Dosya açılamadı</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Değişiklikler '%1' üzerine yazılamıyor.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Yoksayma Deseni Ekle</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Yeni bir yoksayma deseni ekle:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Yoksayma Desenini Düzenle</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Yoksayma desenini düzenle:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Bu girdi '%1' üzerinde sistem tarafından sağlanmaktadır ve bu görünümde değiştirilemez.</translation>
</message>
@@ -1387,7 +1387,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Bağlantı Zaman Aşımı</translation>
</message>
@@ -1395,7 +1395,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Getirme URL'sinden geçersiz JSON yanıtı</translation>
</message>
@@ -1569,33 +1569,38 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Dosya Kaldırıldı</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<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="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>Getirme URL'si eksik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<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="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index 0a54caa..4177f38 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
Відмічені елементи також будуть видалені, якщо вони заважають видалити каталог. Це корисно для метаданих.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>Не вдалося відкрити файл</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>Неможливо запиасати зміни до '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>Додати шаблон ігнорування</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>Додати новий шаблон ігнорування:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>Редагувати Шаблон Ігнорування</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>Редагувати шаблон ігнорування:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Цей запис створено системою в '%1', тут змінити його не можна.</translation>
</message>
@@ -1387,7 +1387,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>Тайм-аут З'єднання</translation>
</message>
@@ -1395,7 +1395,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Неправильна JSON відповідь на сформований URL</translation>
</message>
@@ -1569,33 +1569,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>Файл переміщено</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>Локальний файл змінився під час синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>Не вистачає сформованого URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation>Локальний файл було видалено під час синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер не зміг підтвердити останній відрізок даних. (Були відсутні e-tag)</translation>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index f6a8160..563d5b5 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -814,37 +814,37 @@ Checked items will also be deleted if they prevent a directory from being remove
如果选中的项目正在阻止文件夹的删除，它们也会被删除。这对于元数据很有用。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>不能打开文件</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>无法向 %1 中写入修改。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>增加忽略模式</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>增加新的忽略模式：</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>编辑忽略模式</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>编辑忽略模式：</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>此项目由系统在 %1 处提供，不能在这里被修改。</translation>
</message>
@@ -1386,7 +1386,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -1394,7 +1394,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>推送 URL 传来的 JSON 无效</translation>
</message>
@@ -1568,33 +1568,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>已移除文件</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation>缺少轮询 URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation>本地文件在同步时已删除。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>服务器找不到上一分块。（找不到 E-tag）</translation>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index d668a38..c8992c9 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -809,37 +809,37 @@ Checked items will also be deleted if they prevent a directory from being remove
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="96"/>
<source>Could not open file</source>
<translation>無法開啟檔案</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="98"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="97"/>
<source>Cannot write changes to '%1'.</source>
<translation>%1 無法寫入變更。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="104"/>
<source>Add Ignore Pattern</source>
<translation>增加忽略格式</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="106"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="105"/>
<source>Add a new ignore pattern:</source>
<translation>增加一個新的忽略格式:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="127"/>
<source>Edit Ignore Pattern</source>
<translation>編輯忽略格式</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="129"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="128"/>
<source>Edit ignore pattern:</source>
<translation>編輯忽略格式:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="140"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"/>
</message>
@@ -1381,7 +1381,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="93"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="109"/>
<source>Connection Timeout</source>
<translation>連線逾時</translation>
</message>
@@ -1389,7 +1389,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="143"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="166"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
@@ -1563,33 +1563,38 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="180"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="203"/>
<source>File Removed</source>
<translation>檔案已移除</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="194"/>
- <location filename="../src/libsync/propagateupload.cpp" line="552"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="217"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="587"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="477"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="504"/>
+ <source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="512"/>
<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="511"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="546"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="534"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="569"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="567"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="602"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list