[Pkg-owncloud-commits] [owncloud-client] 18/175: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Aug 8 10:36:21 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 15bfa4602312c160084e61f4028de3d57787a9cf
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Fri May 8 02:18:56 2015 -0400
[tx-robot] updated from transifex
---
translations/client_ca.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_cs.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_de.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_el.ts | 57 +++++++++++++++++++++++++++-----------------
translations/client_en.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_es.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_es_AR.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_et.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_eu.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_fa.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_fi.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_fr.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_gl.ts | 57 +++++++++++++++++++++++++++-----------------
translations/client_hu.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_it.ts | 57 +++++++++++++++++++++++++++-----------------
translations/client_ja.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_nl.ts | 57 +++++++++++++++++++++++++++-----------------
translations/client_pl.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_pt.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_pt_BR.ts | 57 +++++++++++++++++++++++++++-----------------
translations/client_ru.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_sk.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_sl.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_sr.ts | 57 +++++++++++++++++++++++++++-----------------
translations/client_sv.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_th.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_tr.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_uk.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_zh_CN.ts | 55 ++++++++++++++++++++++++++----------------
translations/client_zh_TW.ts | 55 ++++++++++++++++++++++++++----------------
30 files changed, 1026 insertions(+), 636 deletions(-)
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index 9bb8d04..5ce4740 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1193,24 +1201,24 @@ privilegis addicionals durant el procés.</translation>
<translation>Configura el sevidor %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Aquesta adreça NO és segura i no és encriptada.
No és aconsellada usar-la.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Aquesta url és segura. Podeu usar-la.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Següent ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Actualitza el servidor %1</translation>
</message>
@@ -1447,6 +1455,11 @@ No és aconsellada usar-la.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1577,7 +1590,7 @@ No és aconsellada usar-la.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>El fitxer local ha canviat durant la sincronització.</translation>
</message>
@@ -1602,7 +1615,7 @@ No és aconsellada usar-la.</translation>
<translation>El fitxer local s'ha eliminat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1849,7 +1862,7 @@ No és aconsellada usar-la.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1874,12 +1887,12 @@ No és aconsellada usar-la.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1889,58 +1902,58 @@ No és aconsellada usar-la.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Escolliu una contrasenya per l'enllaç públic</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 474b7a3..830fedf 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1192,24 +1200,24 @@ můžete být požádáni o dodatečná oprávnění.</translation>
<translation>Nastavit server %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Tato adresa NENÍ bezpečná, protože není šifrovaná.
Nedoporučuje se jí používat.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>URL je bezpečná. Můžete ji použít.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Následující ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Upravit server %1</translation>
</message>
@@ -1446,6 +1454,11 @@ Nedoporučuje se jí používat.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1576,7 +1589,7 @@ Nedoporučuje se jí používat.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Místní soubor byl změněn během synchronizace.</translation>
</message>
@@ -1601,7 +1614,7 @@ Nedoporučuje se jí používat.</translation>
<translation>Místní soubor byl odstraněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1854,7 +1867,7 @@ Nedoporučuje se jí používat.</translation>
<translation>Nastavit heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 v umístění: %2</translation>
</message>
@@ -1879,12 +1892,12 @@ Nedoporučuje se jí používat.</translation>
<translation>Ch&ránit heslem</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Chráněno heslem</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Tento soubor nelze sdílet, protože byl nasdílen bez možnosti dalšího sdílení.</translation>
</message>
@@ -1894,58 +1907,58 @@ Nedoporučuje se jí používat.</translation>
<translation>Veřejné s&dílení vyžaduje heslo:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Zadej heslo pro tento veřejný odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>&Sdílet odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>OCS API chybový kód: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Není nakonfigurována žádná synchronizační složka.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Nelze nalézt adresář pro nahrávání.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Existuje synchronizovaný soubor stejného jména. Tento soubor nelze registrovat pro synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Soubor nelze synchronizovat.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Sdílení externích adresářů ještě nefunguje.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Čekání na nahrávání...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Nelze registrovat v synchronizačním umístění.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Synchronizace registrovaného souboru ještě nebyla úspěšná.</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index cde733b..008b945 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1192,24 +1200,24 @@ for additional privileges during the process.</source>
<translation>%1 Server einrichten</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Diese URL ist NICHT sicher, das sie nicht verschlüsselt ist.
Es ist nicht ratsam, diese zu benutzen.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Diese URL ist sicher. Sie können Sie benutzen.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Weiter ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>%1 Server aktualisieren</translation>
</message>
@@ -1446,6 +1454,11 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1576,7 +1589,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
</message>
@@ -1601,7 +1614,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1853,7 +1866,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Passwort setzen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1-Pfad: %2</translation>
</message>
@@ -1878,12 +1891,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Passwort geschützt</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>passwortgeschützt</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Die Datei kann nicht geteilt werden, weil sie ohne erneute Teilungs-Berechtigung für Sie geteilt wurde.</translation>
</message>
@@ -1893,58 +1906,58 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Öffentliches Teilen erfordert ein Passwort:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Wählen Sie ein Passwort für den öffentlichen Link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>&Link teilen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>OCS-API-Fehlercode: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Es ist kein Synchronisationsordner konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Kann keinen Ordner zum Hochladen finden.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Eine Syncdatei selben Namens existiert. Die Datei kann nicht zur Synchronisation registriert werden.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Die Datei kann nicht synchronisiert werden.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Das Teilen von externen Verzeichnissen funktioniert noch nicht.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Warten auf das Hochladen…</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Registrierung im Synchronisationsraum nicht möglich.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Die Synchronisation der registrierten Datei war noch nicht erfolgreich.</translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index ab3421f..0e96b05 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="el" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1193,24 +1201,24 @@ for additional privileges during the process.</source>
<translation>Ρύθμιση %1 διακομιστή</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Αυτή η ιστοσελίδα ΔΕΝ είναι ασφαλής καθώς δεν είναι κρυπτογραφημένη.
Δεν προτείνεται να τη χρησιμοποιήσετε.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Αυτή η url είναι ασφαλής. Μπορείτε να τη χρησιμοποιήσετε. </translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Επόμενο ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Ενημέρωση %1 διακομιστή</translation>
</message>
@@ -1447,6 +1455,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1577,14 +1590,14 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
<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>Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt < 5.4.2</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="512"/>
@@ -1602,7 +1615,7 @@ It is not advisable to use it.</source>
<translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
</message>
@@ -1855,7 +1868,7 @@ It is not advisable to use it.</source>
<translation>Ορισμός κωδικού πρόσβασης</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 διαδρομή: %2</translation>
</message>
@@ -1880,12 +1893,12 @@ It is not advisable to use it.</source>
<translation>Π&ροστασία με κωδικό</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Προστατευμένο με κωδικό πρόσβασης</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Το αρχείο δεν μπορεί να διαμοιραστεί γιατί διαμοιράστηκε χωρίς δικαιώματα διαμοιρασμού.</translation>
</message>
@@ -1895,58 +1908,58 @@ It is not advisable to use it.</source>
<translation>Ο δημόσιος &διαμοιρασμός απαιτεί κωδικό πρόσβασης:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>Δ&ιαμοιρασμός συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>OCS API κωδικός λάθους: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Δεν έχει οριστεί φάκελος συνχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Αδυναμία εύρεσης φακέλου μεταφόρτωσης.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Ήδη υπάρχει αρχείο συγχρονισμού με το ίδιο όνομα. Το αρχείο δεν μπορεί να καταχωρηθεί προς συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Το αρχείο δεν μπορεί να συγχρονιστεί.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Ο διαμοιρασμός εξωτερικών καταλόγων δεν λειτουργεί ακόμα.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Αναμονή για μεταφόρτωση</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Αδυναμία καταχώρησης στο χώρο συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Ο συγχρονισμός του καταχωρημένου αρχείου δεν πέτυχε ακόμη.</translation>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 372f2e8..545f391 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -2,6 +2,14 @@
<!DOCTYPE TS>
<TS version="2.0" language="en_US">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1188,23 +1196,23 @@ for additional privileges during the process.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation type="unfinished"></translation>
</message>
@@ -1441,6 +1449,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1571,7 +1584,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
@@ -1596,7 +1609,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
@@ -1849,7 +1862,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"></translation>
</message>
@@ -1874,12 +1887,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"></translation>
</message>
@@ -1889,58 +1902,58 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index b237e7a..0684e30 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,24 +1199,24 @@ for additional privileges during the process.</source>
<translation>Configurar servidor %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Esta URL NO ES SEGURA; pues no está cifrada.
No se recomienda usarla.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Esta url es segura. Puede utilizarla.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Siguiente ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Actualizar servidor %1</translation>
</message>
@@ -1445,6 +1453,11 @@ No se recomienda usarla.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,7 +1588,7 @@ No se recomienda usarla.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Un archivo local fue modificado durante la sincronización.</translation>
</message>
@@ -1600,7 +1613,7 @@ No se recomienda usarla.</translation>
<translation>El archivo local fue eliminado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1850,7 +1863,7 @@ No se recomienda usarla.</translation>
<translation>Establecer contraseña</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 ruta: %2</translation>
</message>
@@ -1875,12 +1888,12 @@ No se recomienda usarla.</translation>
<translation>Protegido por contr&aseña </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Contraseña protegida</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>El archivo no puede compartirse; ya que fue compartido sin permisos correspondientes.</translation>
</message>
@@ -1890,58 +1903,58 @@ No se recomienda usarla.</translation>
<translation>Se requiere una contraseña para compartir públicamente:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Elija una contraseña para el enlace publico</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>&Compartir enlace</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>OCS API codigo error: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>No hay ninguna carpeta de sincronización configurada.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>No puede hallarse una carpeta a la cual subir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Existe un archivo sincronizado con el mismo nombre. Éste no se puede registrar para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>El archivo no puede sincronizarse.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>La compartición de directorios externos no está funcionando aún.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Esperando para subir...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>No se pudo registrar el espacio de sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>La sincronización de los archivos registrados aún no ha sido exitosa.</translation>
</message>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index 474538c..5fcfc8f 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_AR" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1190,23 +1198,23 @@ for additional privileges during the process.</source>
<translation>Configurando servidor %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Esta URL es segura. La podés usar.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Actualizando servidor %1</translation>
</message>
@@ -1443,6 +1451,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1573,7 +1586,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
@@ -1598,7 +1611,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1845,7 +1858,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1870,12 +1883,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1885,58 +1898,58 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index 25d5201..62357fe 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,24 +1199,24 @@ for additional privileges during the process.</source>
<translation>Seadista %1 server</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>See url EI OLE turvaline, kuna see pole krüpteeritud.
Selle kasutamine pole soovitatav.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>See aadress on turvaline. Võid seda kasutada.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Edasi ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Uuenda %1 serverit</translation>
</message>
@@ -1445,6 +1453,11 @@ Selle kasutamine pole soovitatav.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,7 +1588,7 @@ Selle kasutamine pole soovitatav.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
</message>
@@ -1600,7 +1613,7 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1847,7 +1860,7 @@ Selle kasutamine pole soovitatav.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1872,12 +1885,12 @@ Selle kasutamine pole soovitatav.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1887,58 +1900,58 @@ Selle kasutamine pole soovitatav.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Vali avaliku lingi jaoks parool</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>&Jaga linki</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index 12e6c10..5ee04b4 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="eu" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,24 +1199,24 @@ for additional privileges during the process.</source>
<translation>Konfiguratu %1 zerbitzaria</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Url hori EZ da segurua ez baitago kodetuta.
Ez da gomendagarria erabltzea.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Url hau segurua da. Berau erabili dezakezu.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Eguneratu %1 zerbitzaria</translation>
</message>
@@ -1445,6 +1453,11 @@ Ez da gomendagarria erabltzea.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,7 +1588,7 @@ Ez da gomendagarria erabltzea.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
</message>
@@ -1600,7 +1613,7 @@ Ez da gomendagarria erabltzea.</translation>
<translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1847,7 +1860,7 @@ Ez da gomendagarria erabltzea.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1872,12 +1885,12 @@ Ez da gomendagarria erabltzea.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1887,58 +1900,58 @@ Ez da gomendagarria erabltzea.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Aukeratu pasahitz bat esteka publikorako</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 4cbdb47..75585f2 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1188,23 +1196,23 @@ for additional privileges during the process.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>این ادرس امن است. شما می توانید از آن استفاده کنید.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation type="unfinished"/>
</message>
@@ -1441,6 +1449,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1571,7 +1584,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
@@ -1596,7 +1609,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1843,7 +1856,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1868,12 +1881,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1883,58 +1896,58 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index 36ce89f..e683edf 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1187,24 +1195,24 @@ for additional privileges during the process.</source>
<translation>%1-palvelimen asetuksien määritys</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Tämä osoite ei ole turvallinen, koska sitä ei ole salattu.
Osoitteen käyttäminen ei ole suositeltavaa.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Tämä osoite on turvallinen. Voit käyttää sitä.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Seuraava ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Päivitä %1-palvelin</translation>
</message>
@@ -1441,6 +1449,11 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1571,7 +1584,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
@@ -1596,7 +1609,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1843,7 +1856,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Aseta salasana</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1-polku: %2</translation>
</message>
@@ -1868,12 +1881,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>&Suojaa salasanalla</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Salasanasuojattu</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1883,58 +1896,58 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>&Julkinen jakaminen vaatii salasanan:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Valitse salasana julkiselle linkille</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>&Jaa linkki</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Tiedostoa ei voi synkronoida.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Odotetaan siirtoa...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 78e25bb..7a3a01c 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1192,24 +1200,24 @@ L'assistant peut demander des privilèges additionnels durant le processus.
<translation>Configurer le serveur %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Cette adresse n'est PAS sécurisée car non chiffrée.
Il est déconseillé de l'utiliser.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Cette URL est sécurisée. Vous pouvez l'utiliser.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Suivant ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Modification de l'adresse du serveur %1</translation>
</message>
@@ -1446,6 +1454,11 @@ Il est déconseillé de l'utiliser.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Le fichier %1 n'a pas pu être sauvegardé en raison d'un conflit sur le nom du fichier local !</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1576,7 +1589,7 @@ Il est déconseillé de l'utiliser.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
@@ -1601,7 +1614,7 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Fichier local supprimé pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1854,7 +1867,7 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Définir le mot de passe</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>Chemin %1 : %2</translation>
</message>
@@ -1879,12 +1892,12 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Protéger par mot de p&asse</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Protégé par un mot de passe</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Le fichier ne peut pas être partagé car il a été partagé sans permission de repartage.</translation>
</message>
@@ -1894,58 +1907,58 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Le p&artage public requiert un mot de passe :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Choisissez un mot de passe pour le lien public</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>&Partage par lien</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>Code d'erreur OCS API : %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Aucun dossier à synchroniser n'est configuré.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Impossible de trouver un dossier vers lequel téléverser.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Un fichier synchronisé avec le même nom existe déjà. Le fichier ne peut être ajouté à la synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Le fichier ne peut pas être synchronisé.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Le partage de dossiers externes n'est pas encore pris en charge.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>En attente d'envoi...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Impossible de s'enregistrer à l'espace de synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>La synchronisation du fichier n'a pas encore pu être effectuée.</translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index bf2161f..a3429df 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1192,24 +1200,24 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl
<translation>Estabelecer o servidor %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Este sitio de Internet non é seguro, xa que non está cifrado.
Recomendámoslle que non o use.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Este URL é seguro. Pode utilizalo.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Seguinte ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Actualizar o servidor %1</translation>
</message>
@@ -1446,6 +1454,11 @@ Recomendámoslle que non o use.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1576,14 +1589,14 @@ Recomendámoslle que non o use.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>O ficheiro local cambiou durante a sincronización.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="504"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation type="unfinished"/>
+ <translation>Forzando a interrupción do traballo na conexión HTTP reiniciandoa con Qt <5.4.2.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="512"/>
@@ -1601,7 +1614,7 @@ Recomendámoslle que non o use.</translation>
<translation>O ficheiro local retirarase durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1851,7 +1864,7 @@ Recomendámoslle que non o use.</translation>
<translation>Estabelecer o contrasinal</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>Ruta a %1: %2</translation>
</message>
@@ -1876,12 +1889,12 @@ Recomendámoslle que non o use.</translation>
<translation>Contr&asinal de protección</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Protexido con contrasinal</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Non é posíbel compartir o ficheiro, xa que foi compartido sen permisis para compartir.</translation>
</message>
@@ -1891,58 +1904,58 @@ Recomendámoslle que non o use.</translation>
<translation>A comp&artición pública precisa de contrasinal </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Escolla un contrasinal para a ligazón pública</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>&Ligazón para compartir</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>API OCS API código de erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Non hai ningún cartafol de sincronización configurado.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Non é posíbel atopar un cartafol que enviar.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Xa existe un ficheiro de sincronización co mesmo nome. Non é posíbel rexistrar o ficheiro para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Non é posíbel sincronizar o ficheiro.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>A compartición de directorios externos aínda non está a funcionar.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Agardando polo envío...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Non é posíbel facer un rexistro no espazo de sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>A sincronización di ficheiro rexistrado no non foi satisfactoria.</translation>
</message>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index cf07b98..2ac1b21 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu_HU" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1186,23 +1194,23 @@ for additional privileges during the process.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Ez az url biztonságos.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation type="unfinished"/>
</message>
@@ -1439,6 +1447,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1569,7 +1582,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
@@ -1594,7 +1607,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1841,7 +1854,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1866,12 +1879,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1881,58 +1894,58 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Válasszon egy jelszót a nyilvános linkhez</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index d7c7064..1a15776 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,24 +1199,24 @@ for additional privileges during the process.</source>
<translation>Configura il server %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Questo URL NON è sicuro poiché non è cifrato.
Non è consigliabile utilizzarlo.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Questo URL è sicuro. Puoi utilizzarlo.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>Ava&nti ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Aggiorna il server %1</translation>
</message>
@@ -1445,6 +1453,11 @@ Non è consigliabile utilizzarlo.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,14 +1588,14 @@ Non è consigliabile utilizzarlo.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Un file locale è cambiato durante la sincronizzazione.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="504"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation type="unfinished"/>
+ <translation>Forzare l'interruzione dell'operazione in caso di ripristino della connessione HTTP con Qt < 5.4.2.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="512"/>
@@ -1600,7 +1613,7 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Il file locale è stato rimosso durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1851,7 +1864,7 @@ Non è consigliabile utilizzarlo.</translation>
<translation>imposta la password</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>Percorso %1: %2</translation>
</message>
@@ -1876,12 +1889,12 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Proteggi con p&assword</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Protetta da password</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Il file non può essere condiviso poiché è stato condiviso senza il permesso di condivisione.</translation>
</message>
@@ -1891,58 +1904,58 @@ Non è consigliabile utilizzarlo.</translation>
<translation>La condivisione pubblic&a richiede una password:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Scegli una password per il collegamento pubblico</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>Condividi colle&gamento</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>Codice di errore API OCS: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Non è stata configurata alcuna cartella per la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Impossibile trovare una cartella di destinazione.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Un file di sincronizzazione con lo stesso nome esiste già. Il file non può essere registrato per la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Il file non può essere sincronizzato.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>La condivisione di cartelle esterne non funziona ancora.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>In attesa di caricamento...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Impossibile registrare nello spazio di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>La sincronizzazione del file registrato non è stata ancora completata.</translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index d06387c..5749e1e 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja_JP" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,23 +1199,23 @@ for additional privileges during the process.</source>
<translation>%1 サーバーを設定</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>このURLは暗号化されていないため安全ではありません。利用はお勧めしません。</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>このURLは安全です。利用可能です。</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>次(&N) ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>%1 サーバーをアップデート</translation>
</message>
@@ -1444,6 +1452,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>%1 はローカルファイル名が衝突しているため保存できません！</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1574,7 +1587,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
@@ -1599,7 +1612,7 @@ It is not advisable to use it.</source>
<translation>ローカルファイルを同期中に削除します。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しません。(e-tag が存在しません)</translation>
</message>
@@ -1848,7 +1861,7 @@ It is not advisable to use it.</source>
<translation>パスワードを設定</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 のパス: %2</translation>
</message>
@@ -1873,12 +1886,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>パスワード保護</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1888,58 +1901,58 @@ It is not advisable to use it.</source>
<translation>パスワードが必要なリンク共有(&a)：</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>URLによる共有のパスワードを入力</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>リンク共有(&S)</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>OCS APIエラーコード: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>同期フォルダーが設定されていません。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>アップロード先のフォルダーが見つかりません。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>同じ名前の同期ファイルがあります。このファイルは同期対象にできません。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>このファイルは同期されません。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>外部ディレクトリの共有はまだ動作していません。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>アップロード待ち...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>同期スペースの登録ができません。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>登録ファイルの同期はまだ成功していません</translation>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index f19f40e..db75ad6 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1192,24 +1200,24 @@ vragen om extra autorisaties tijdens installatie.</translation>
<translation>Instellen %1 server</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Deze url is NIET veilig omdat versleuteling omntbreekt.
We adviseren deze site niet te gebruiken.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Deze url is veilig te gebruiken.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Volgende ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Bijwerken %1 server</translation>
</message>
@@ -1446,6 +1454,11 @@ We adviseren deze site niet te gebruiken.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1576,14 +1589,14 @@ We adviseren deze site niet te gebruiken.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
<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>Forceren job-beëindiging op HTTP verbindingsreset met Qt < 5.4.2.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="512"/>
@@ -1601,7 +1614,7 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1852,7 +1865,7 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Instellen wachtwoord</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 pad: %2</translation>
</message>
@@ -1877,12 +1890,12 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>&Wachtwoord beveiligd</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Wachtwoord beveiligd</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Het bestand kan niet worden gedeeld, omdat het werd gedeeld zonder verder delen toestemming.</translation>
</message>
@@ -1892,58 +1905,58 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Openbaar de&len vergt een wachtwoord:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Kies een wachtwoord voor de openbare link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>$Delen link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>OCS API foutcode: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Er is geen sync map geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Kan geen map vinden om naar te uploaden.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Er bestaat al een sync bestand met dezelfde naam. Het bestand kan niet worden aangemeld voor sync.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Het bestand kan niet worden gesynchroniseerd.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Delen van externe mappen werkt nog niet.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Wachten om te uploaden...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Kan niet aanmelden in sync ruimte.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Sync van aangemeld bestand nog niet succesvol.</translation>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index 1ec5e80..04bc0ae 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,24 +1199,24 @@ for additional privileges during the process.</source>
<translation>Ustaw serwer %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Ten adres url NIE jest bezpieczny, ponieważ jest nieszyfrowany.
Niezalecane jest jego użycie.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Ten adres url jest bezpieczny. Można go użyć.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>Następny</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Zaktualizuj serwer %1</translation>
</message>
@@ -1445,6 +1453,11 @@ Niezalecane jest jego użycie.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,7 +1588,7 @@ Niezalecane jest jego użycie.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
</message>
@@ -1600,7 +1613,7 @@ Niezalecane jest jego użycie.</translation>
<translation>Pliki lokalny został usunięty podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1847,7 +1860,7 @@ Niezalecane jest jego użycie.</translation>
<translation>Ustaw hasło</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1872,12 +1885,12 @@ Niezalecane jest jego użycie.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Zabezpieczone hasłem</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1887,58 +1900,58 @@ Niezalecane jest jego użycie.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Wybierz hasło dla linku publicznego</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Oczekuję na przesyłanie</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index c19d7a5..e55a569 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1190,23 +1198,23 @@ for additional privileges during the process.</source>
<translation>Configurar servidor %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Este endereço não é seguro. A sua utilização não é aconselhada.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Este endereço é seguro. Pode usar</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Próximo></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Actualizar servidor %1</translation>
</message>
@@ -1443,6 +1451,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1573,7 +1586,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Ficheiro local alterado durante a sincronização.</translation>
</message>
@@ -1598,7 +1611,7 @@ It is not advisable to use it.</source>
<translation>O arquivo local foi removido durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1849,7 +1862,7 @@ It is not advisable to use it.</source>
<translation>Defina a senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 caminho: %2</translation>
</message>
@@ -1874,12 +1887,12 @@ It is not advisable to use it.</source>
<translation>Protegida por senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Protegido com Senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1889,58 +1902,58 @@ It is not advisable to use it.</source>
<translation>A &partilha pública requer uma senha:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Escolha a senha para a hiperligação pública</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>&Compartilhe a hiperligação </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>Código de erro OCS API: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Não há pasta de sincronização configurada.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>O ficheiro não pode ser sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Partilha de directórios externos ainda não funciona.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Esperando para carregar...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Não foi possível registar no espaço de sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Sincronização do ficheiro registado não foi bem sucedida.</translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index 1dffb47..a966d0a 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1192,23 +1200,23 @@ por privilégios adicionais durante o processo.</translation>
<translation>Configurar servidor %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Esta URL não é segura, pois não é criptografada. Não é aconselhável usá-lo.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Esta url é segura. Você pode usá-la.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Póximo ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Atualizar o servidor %1</translation>
</message>
@@ -1445,6 +1453,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,14 +1588,14 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Arquivo local modificado durante a sincronização.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="504"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation type="unfinished"/>
+ <translation>Forçando cancelamento do trabalho em redefinição de conexão HTTP com o Qt < 5.4.2.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="512"/>
@@ -1600,7 +1613,7 @@ It is not advisable to use it.</source>
<translation>O arquivo local foi removido durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1847,7 +1860,7 @@ It is not advisable to use it.</source>
<translation>Configurar senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>Caminho %1: %2</translation>
</message>
@@ -1872,12 +1885,12 @@ It is not advisable to use it.</source>
<translation>S&enha de proteção</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Protegido por Senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>O arquivo não pode ser partilhado, pois foi compartilhado sem permissão de compartilhamento.</translation>
</message>
@@ -1887,58 +1900,58 @@ It is not advisable to use it.</source>
<translation>Co&mpartilhamento Público reque uma senha:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Escolha uma senha para o link público</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>Link de &Compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>Código de erro OCS API: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Não há nenhuma pasta de sincronização configurada.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Não consegue encontrar uma pasta para enviar para.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Um arquivo de sincronia com o mesmo nome já existe. O arquivo não pode ser registrado para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>O arquivo não pode ser sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Compartilhamento de diretórios externos ainda não está funcionando.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Esperando para fazer o envio...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Não foi possível registrar no espaço sincronia.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Sincronização de arquivos registrados não foi bem sucedida ainda.</translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 5848b15..6349310 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1192,24 +1200,24 @@ for additional privileges during the process.</source>
<translation>Настроить сервер %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Эта ссылка НЕ безопасна, так как не зашифрована.
Мы не рекомендуем её использовать.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Данная ссылка безопасна. Вы можете её использовать.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Далее > </translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Обновить сервер %1</translation>
</message>
@@ -1446,6 +1454,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1576,7 +1589,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Локальный файл изменился в процессе синхронизации.</translation>
</message>
@@ -1601,7 +1614,7 @@ It is not advisable to use it.</source>
<translation>Локальный файл был удалён в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation>
</message>
@@ -1856,7 +1869,7 @@ It is not advisable to use it.</source>
<translation>Установить пароль</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 путь: %2</translation>
</message>
@@ -1881,12 +1894,12 @@ It is not advisable to use it.</source>
<translation>Защитить паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Защищено Паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Невозможно предоставить общий доступ к файлу: нет разрешения на предоставление общего доступа.</translation>
</message>
@@ -1896,58 +1909,58 @@ It is not advisable to use it.</source>
<translation>Запросить пароль на публичную ссылку:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Укажите пароль для публичной ссылки</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>Поделиться ссылкой</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>Код ошибки OCS API: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Нет папок настроенных для синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Не возможно найти папку для загрузки в неё.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Существует файл с именем как и у синхронизируемого. Файл не может быть принят к синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Файл не может быть синхронизирован.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Функция открытия доступа к внешним папкам пока не работает.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Ожидание загрузки...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Не возможно зарегистрироваться в синхронизируемом пространстве.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Синхронизация зарегистрированного файла пока не была успешной.</translation>
</message>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index 4175ac2..c633a36 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,24 +1199,24 @@ for additional privileges during the process.</source>
<translation>Nastaviť server %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Táto adresa nie je bezpečná, pretože nie je šifrovaná.
Nie je vhodné ju používať.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Táto URL je bezpečná. Môžete ju používať.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Ďalšia ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Aktualizovať server %1</translation>
</message>
@@ -1445,6 +1453,11 @@ Nie je vhodné ju používať.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,7 +1588,7 @@ Nie je vhodné ju používať.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Lokálny súbor bol zmenený počas synchronizácie.</translation>
</message>
@@ -1600,7 +1613,7 @@ Nie je vhodné ju používať.</translation>
<translation>Lokálny súbor bol odstránený počas synchronizácie.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1853,7 +1866,7 @@ Nie je vhodné ju používať.</translation>
<translation>Nastaviť heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 v umiestnení: %2</translation>
</message>
@@ -1878,12 +1891,12 @@ Nie je vhodné ju používať.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Chránené heslom</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1893,58 +1906,58 @@ Nie je vhodné ju používať.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Zadajte heslo pre tento verejný odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>OCS API chybový kód: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Nie je nakonfigurovaný žiadny synchronizačný priečinok.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Zdieľanie externých priečinkov ešte nefunguje.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Čakanie na nahrávanie...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Nemožno registrovať v synchronizačnom umiestnení.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Synchronizácia registrovaného súboru ešte nebola dokončená.</translation>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index 0cf2735..4d57c3b 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,24 +1199,24 @@ for additional privileges during the process.</source>
<translation>Nastavi strežnik %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Na naslov URL ni varen, saj ni šifriran.
Uporaba ni priporočljiva.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Ta naslov URL je varen za uporabo.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Naslednja ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Posodobi strežnik %1</translation>
</message>
@@ -1445,6 +1453,11 @@ Uporaba ni priporočljiva.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,7 +1588,7 @@ Uporaba ni priporočljiva.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
</message>
@@ -1600,7 +1613,7 @@ Uporaba ni priporočljiva.</translation>
<translation>Krajevna datoteka je bila me usklajevanjem odstranjena.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1847,7 +1860,7 @@ Uporaba ni priporočljiva.</translation>
<translation>Nastavi geslo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1872,12 +1885,12 @@ Uporaba ni priporočljiva.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Zaščiteno z geslom</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1887,58 +1900,58 @@ Uporaba ni priporočljiva.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Izberite geslo za javno povezavo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index bc779d2..e607d01 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1192,24 +1200,24 @@ for additional privileges during the process.</source>
<translation>Подеси %1 сервер</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Ова адреса НИЈЕ безбедна јер није шифрована.
Не препоручује се њено коришћење.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Ова адреса је безбедна. Можете је користити.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Следеће ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Ажурирај %1 сервер</translation>
</message>
@@ -1446,6 +1454,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1576,14 +1589,14 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Локални фајл измењен током синхронизације.</translation>
</message>
<message>
<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>Присили прекид посла код прекида ХТТП везе са КуТ < 5.4.2</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="512"/>
@@ -1601,7 +1614,7 @@ It is not advisable to use it.</source>
<translation>Локални фајл је уклоњен током синхронизације.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер није потврдио последње парче. (није било е-ознаке)</translation>
</message>
@@ -1854,7 +1867,7 @@ It is not advisable to use it.</source>
<translation>Постави лозинку</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 путања: %2</translation>
</message>
@@ -1879,12 +1892,12 @@ It is not advisable to use it.</source>
<translation>&Заштићено лозинком</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Заштићено лозинком</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Фајл се не може делити јер је подељен без дозволе за поновно дељење.</translation>
</message>
@@ -1894,58 +1907,58 @@ It is not advisable to use it.</source>
<translation>Јавна &дељења захтевају лозинку:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Одредите лозинку за јавну везу</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>&Веза дељења</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>ОЦС АПИ код грешке: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Фасцикла за синхронизацију није подешена.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Не могу да нађем фасциклу за отпремање.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Фајл са истим називом већ постоји. Не може се изабрати за синхронизацију.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Фајл се не може синхронизовати.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Дељење спољних директоријума још увек не ради.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Чекам отпремање...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Не могу да пријавим синхронизацију.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Синхронизација пријављеног фајла још није успела.</translation>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 7e03658..0889bb5 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,24 +1199,24 @@ for additional privileges during the process.</source>
<translation>Installerar %1 server</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Denna URL är INTE säker eftersom den inte är krypterad.
Det är inte lämpligt använda den.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Denna url är säker. Du kan använda den.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Nästa ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Uppdaterar %1 server</translation>
</message>
@@ -1445,6 +1453,11 @@ Det är inte lämpligt använda den.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,7 +1588,7 @@ Det är inte lämpligt använda den.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
@@ -1600,7 +1613,7 @@ Det är inte lämpligt använda den.</translation>
<translation>Den lokala filen togs bort under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1847,7 +1860,7 @@ Det är inte lämpligt använda den.</translation>
<translation>Ange lösenord</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1872,12 +1885,12 @@ Det är inte lämpligt använda den.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Lösenordsskyddad</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1887,58 +1900,58 @@ Det är inte lämpligt använda den.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Välj ett lösenord för den publika länken</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 73b6aa1..9dcc3f8 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="th_TH" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1186,23 +1194,23 @@ for additional privileges during the process.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation type="unfinished"/>
</message>
@@ -1439,6 +1447,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1569,7 +1582,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
@@ -1594,7 +1607,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1841,7 +1854,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1866,12 +1879,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1881,58 +1894,58 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 771aac2..be0350b 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,24 +1199,24 @@ for additional privileges during the process.</source>
<translation>%1 sunucusunu ayarla</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Bu adres şifrelenmediğinden güvenli DEĞİL.
Kullanmanız önerilmez.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Bu adres güvenli. Kullanabilirsiniz.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&İleri ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>%1 sunucusunu güncelle</translation>
</message>
@@ -1445,6 +1453,11 @@ Kullanmanız önerilmez.</translation>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi!</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,7 +1588,7 @@ Kullanmanız önerilmez.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Eşitleme sırasında yerel dosya değişti.</translation>
</message>
@@ -1600,7 +1613,7 @@ Kullanmanız önerilmez.</translation>
<translation>Eşitleme sırasında yerel dosya kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<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>
@@ -1851,7 +1864,7 @@ Kullanmanız önerilmez.</translation>
<translation>Parolayı ayarla</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 yol: %2</translation>
</message>
@@ -1876,12 +1889,12 @@ Kullanmanız önerilmez.</translation>
<translation>Şi&fre koruma</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Parola Korumalı</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Dosya paylaşılamaz, çünkü sizinle paylaşım izni olmaksızın paylaşılmış.</translation>
</message>
@@ -1891,58 +1904,58 @@ Kullanmanız önerilmez.</translation>
<translation>Herkese &açık paylaşım için şifre gerekir:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Herkese açık bağlantı için bir parola seçin</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation>Bağlantıyı pa&ylaş</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>OCS API hata kodu: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Yapılandırılmış eşitleme klasörü yok.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Yüklenecek dizin bulunamıyor.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Eşitlenecek dosya ile aynı isimde bir dosya var. Dosya eşitleme için kaydedilemiyor.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Dosya eşitlenemedi.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Harici dizinlerin paylaşımı henüz çalışmıyor.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Yüklemek için bekliyor...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Eşitleme uzayında kaydetme başarısız.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Kayıtlı dosyanın eşitlenmesi henüz başarılı değil.</translation>
</message>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index 4177f38..9ff4034 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,24 +1199,24 @@ for additional privileges during the process.</source>
<translation>Налаштувати %1 сервер</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>Це посилання НЕ зашифроване.
Ми не рекомендуємо відкривати такі посилання.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>Ця адреса безпечна. Її можна використовувати.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>&Наступний></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>Оновити %1 сервер</translation>
</message>
@@ -1445,6 +1453,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл %1 не збережено, через локальний конфлікт ім'я! </translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1575,7 +1588,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>Локальний файл змінився під час синхронізації.</translation>
</message>
@@ -1600,7 +1613,7 @@ It is not advisable to use it.</source>
<translation>Локальний файл було видалено під час синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер не зміг підтвердити останній відрізок даних. (Були відсутні e-tag)</translation>
</message>
@@ -1853,7 +1866,7 @@ It is not advisable to use it.</source>
<translation>Встановіть пароль</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 шлях: %2</translation>
</message>
@@ -1878,12 +1891,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>Захищено паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Цей файл неможливо поширити, бо ним поділилися без права на поширення.</translation>
</message>
@@ -1893,58 +1906,58 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>Оберіть пароль для опублікованого посилання</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>OCS API код помилки: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>Немає папок налаштованих для синхронізації.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation>Неможливо знайти папку для завантаження в неї.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation>Файл синхронізації з такою ж назвою існує. Цей файл неможливо зареєструвати для синхронізації.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>Файл неможливо синхронізувати</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation>Функція відкриття доступу до зовнішніх папок поки не працює.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>Очікування завантаження...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation>Неможливо зареєструватися в синхронізованому просторі.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation>Синхронізація зареєстрованого файлу поки не була успішною.</translation>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 563d5b5..ebe0920 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1191,23 +1199,23 @@ for additional privileges during the process.</source>
<translation>设置 %1 服务器</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation>这个地址没有使用加密，不够安全，不建议使用。</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>此地址是安全的。您可以使用它</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>下一步 (&N) ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>更新 %1 服务器</translation>
</message>
@@ -1444,6 +1452,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>由于本地文件名冲突，文件 %1 无法保存。</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1574,7 +1587,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
@@ -1599,7 +1612,7 @@ It is not advisable to use it.</source>
<translation>本地文件在同步时已删除。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>服务器找不到上一分块。（找不到 E-tag）</translation>
</message>
@@ -1848,7 +1861,7 @@ It is not advisable to use it.</source>
<translation>设置密码</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation>%1 路径：%2</translation>
</message>
@@ -1873,12 +1886,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>密码保护</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>未分配共享权限，无法共享文件。</translation>
</message>
@@ -1888,58 +1901,58 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>为共享链接设置密码</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation>OCS API 错误代码：%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>未配置共享文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation>此文件无法同步。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>等待上传...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index c8992c9..046e8f2 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -1,5 +1,13 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.0">
<context>
+ <name>FileSystem</name>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="191"/>
+ <source>The destination file has an unexpected size or modification time</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>FolderWizardSourcePage</name>
<message>
<location filename="../src/gui/folderwizardsourcepage.ui" line="14"/>
@@ -1186,23 +1194,23 @@ for additional privileges during the process.</source>
<translation>設定 %1 伺服器</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="120"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="121"/>
<source>This url is NOT secure as it is not encrypted.
It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="124"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="125"/>
<source>This url is secure. You can use it.</source>
<translation>這個 URL 是安全的，您可以使用它。</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="163"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="164"/>
<source>&Next ></source>
<translation>下一步 (&N) ></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="295"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="296"/>
<source>Update %1 server</source>
<translation>更新 %1 伺服器</translation>
</message>
@@ -1439,6 +1447,11 @@ It is not advisable to use it.</source>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="537"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -1569,7 +1582,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="217"/>
- <location filename="../src/libsync/propagateupload.cpp" line="587"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="580"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
@@ -1594,7 +1607,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="602"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="595"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1841,7 +1854,7 @@ It is not advisable to use it.</source>
<translation>設定密碼</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="649"/>
+ <location filename="../src/gui/sharedialog.cpp" line="631"/>
<source>%1 path: %2</source>
<translation type="unfinished"/>
</message>
@@ -1866,12 +1879,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="196"/>
+ <location filename="../src/gui/sharedialog.cpp" line="203"/>
<source>Password Protected</source>
<translation>密碼保護</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="341"/>
+ <location filename="../src/gui/sharedialog.cpp" line="342"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
@@ -1881,58 +1894,58 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="469"/>
+ <location filename="../src/gui/sharedialog.cpp" line="467"/>
<source>Choose a password for the public link</source>
<translation>為公開連結選一個密碼</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="521"/>
- <location filename="../src/gui/sharedialog.cpp" line="522"/>
+ <location filename="../src/gui/sharedialog.cpp" line="503"/>
+ <location filename="../src/gui/sharedialog.cpp" line="504"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="540"/>
+ <location filename="../src/gui/sharedialog.cpp" line="522"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="562"/>
+ <location filename="../src/gui/sharedialog.cpp" line="544"/>
<source>There is no sync folder configured.</source>
<translation>尚未設置同步資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="574"/>
+ <location filename="../src/gui/sharedialog.cpp" line="556"/>
<source>Cannot find an folder to upload to.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="596"/>
+ <location filename="../src/gui/sharedialog.cpp" line="578"/>
<source>A sync file with the same name exists. The file cannot be registered to sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="641"/>
+ <location filename="../src/gui/sharedialog.cpp" line="623"/>
<source>The file cannot be synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="581"/>
+ <location filename="../src/gui/sharedialog.cpp" line="563"/>
<source>Sharing of external directories is not yet working.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="608"/>
+ <location filename="../src/gui/sharedialog.cpp" line="590"/>
<source>Waiting to upload...</source>
<translation>上傳等候中...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="610"/>
+ <location filename="../src/gui/sharedialog.cpp" line="592"/>
<source>Unable to register in sync space.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
+ <location filename="../src/gui/sharedialog.cpp" line="633"/>
<source>Sync of registered file was not successful yet.</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