[Pkg-owncloud-commits] [owncloud-client] 28/83: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat May 31 11:31:40 UTC 2014
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 0f20a4f546fe063430e5f9bbb0873c0b4c64760c
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Sat May 24 01:25:29 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 50 +++++++++++++++++++++++-----------------
translations/mirall_cs.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_de.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_el.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_en.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_es.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_es_AR.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_et.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_eu.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_fa.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_fi.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_fr.ts | 54 +++++++++++++++++++++++++-------------------
translations/mirall_gl.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_hu.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_it.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_ja.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_nl.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_pl.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_pt.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_pt_BR.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_ru.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_sk.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_sl.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_sv.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_th.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_tr.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_uk.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_zh_CN.ts | 48 +++++++++++++++++++++++----------------
translations/mirall_zh_TW.ts | 48 +++++++++++++++++++++++----------------
29 files changed, 816 insertions(+), 584 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index dd2994b..28b5f4b 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -596,17 +596,17 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -821,7 +821,7 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
<message>
<location filename="../src/updater/ocupdater.cpp" line="273"/>
<source>Get update</source>
- <translation>Obtén l'actialització</translation>
+ <translation>Obtingueu l'actualització</translation>
</message>
</context>
<context>
@@ -1247,7 +1247,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,9 +1271,17 @@ No és aconsellada usar-la.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1281,12 +1289,12 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>No s'ha pogut crear el directori %1</translation>
</message>
@@ -1294,7 +1302,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>No s'ha pogut esborrar la carpeta %1</translation>
</message>
@@ -1302,7 +1310,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1310,17 +1318,17 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Aquesta carpeta no es pot reanomenar. Reanomeneu-la de nou Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1347,17 +1355,17 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>El fitxer local ha canviat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1483,27 +1491,27 @@ Proveu de sincronitzar-los de nou.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Compte</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Activitat</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Xarxa</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 249c65b..1fcda4c 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -596,17 +596,17 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Spojení Vypršelo</translation>
</message>
@@ -1247,7 +1247,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Spojení Vypršelo</translation>
</message>
@@ -1271,9 +1271,17 @@ Nedoporučuje se jí používat.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Soubor nebo adresář by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation>
</message>
@@ -1281,12 +1289,12 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>nepodařilo se vytvořit adresář %1</translation>
</message>
@@ -1294,7 +1302,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Nepodařilo se odstranit adresář %1</translation>
</message>
@@ -1302,7 +1310,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Soubor byl odebrán ze sdílení pouze pro čtení. Soubor byl obnoven.</translation>
</message>
@@ -1310,17 +1318,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven.</translation>
</message>
@@ -1347,17 +1355,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Místní soubor byl změněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
</message>
@@ -1484,27 +1492,27 @@ Zkuste provést novou synchronizaci.
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Účet</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Hlavní</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Síť</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 6331f7f..21d5598 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -597,17 +597,17 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -1248,7 +1248,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -1272,9 +1272,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Eine Datei oder Verzeichnis wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation>
</message>
@@ -1282,12 +1290,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Achtung, es könnte ein Problem mit der Groß- und Kleinschreibung für %1 auftreten</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
</message>
@@ -1295,7 +1303,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Verzeichnis %1 konnte nicht entfernt werden</translation>
</message>
@@ -1303,7 +1311,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe gelöscht. Die Datei wurde wiederhergestellt.</translation>
</message>
@@ -1311,17 +1319,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Bitte benennen Sie es zurück wie in der Freigabe.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt.</translation>
</message>
@@ -1348,17 +1356,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge 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>
@@ -1484,27 +1492,27 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Nutzerkonto</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Netzwerk</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 8508b2a..d2a88c6 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -596,17 +596,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Δεν ελήφθη E-Tag από τον διακομιστή, ελέγξτε τον διακομιστή μεσολάβησης/πύλη</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Χρονικό όριο σύνδεσης</translation>
</message>
@@ -1247,7 +1247,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Χρονικό όριο σύνδεσης</translation>
</message>
@@ -1271,9 +1271,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Ένα αρχείο ή ένας κατάλογος αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση, αλλά η επαναφορά απέτυχε: %1</translation>
</message>
@@ -1281,12 +1289,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>αδυναμία δημιουργίας καταλόγου %1</translation>
</message>
@@ -1294,7 +1302,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Αδυναμία αφαίρεσης καταλόγου %1</translation>
</message>
@@ -1302,7 +1310,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Το αρχείο διαγράφηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση. Το αρχείο επαναφέρθηκε.</translation>
</message>
@@ -1310,17 +1318,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε το ξανά Κοινόχρηστος.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Το αρχείο μετονομάστηκε αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Το αρχικό αρχείο επαναφέρθηκε.</translation>
</message>
@@ -1347,17 +1355,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και η επεξεργασία σας βρίσκεται στο αρχείο συγκρούσεων.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Ο διακομιστής δεν επιβεβαίωσε το τελευταίο τμήμα. (Δεν υπήρχε E-Tag)</translation>
</message>
@@ -1483,27 +1491,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Λογαριασμός</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Δραστηριότητα</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Γενικά</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Δίκτυο</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index e45ba0a..24ee87b 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -595,17 +595,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -1242,7 +1242,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -1266,9 +1266,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1276,12 +1284,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1289,7 +1297,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1297,7 +1305,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"></translation>
</message>
@@ -1305,17 +1313,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"></translation>
</message>
@@ -1342,17 +1350,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
@@ -1477,27 +1485,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index ab46a54..ab53f2e 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -596,17 +596,17 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió ninguna e-tag del servidor, revisar el proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -1247,7 +1247,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -1271,9 +1271,17 @@ No se recomienda usarlo.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Un archivo o directorio fue eliminado de una carpeta compartida en modo de solo lectura, pero la recuperación falló: %1</translation>
</message>
@@ -1281,12 +1289,12 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, posible error de muyuscula/minisculas en %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>No se pudo crear el directorio %1</translation>
</message>
@@ -1294,7 +1302,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>No se pudo eliminar el directorio %1</translation>
</message>
@@ -1302,7 +1310,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>El archvo fue eliminado de una carpeta compartida en modo de solo lectura. Ha sido recuperado.</translation>
</message>
@@ -1310,17 +1318,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta carpeta no debe ser renombrada. Favor de renombrar a Compartida.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>El archivo fue renombrado, pero es parte de una carpeta compartida en modo de solo lectura. El archivo original ha sido recuperado.</translation>
</message>
@@ -1347,17 +1355,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Un archivo local fue modificado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge 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>
@@ -1483,27 +1491,27 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Red</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 2537099..ef9af06 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -596,17 +596,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1245,7 +1245,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1269,9 +1269,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1279,12 +1287,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1292,7 +1300,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1300,7 +1308,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1308,17 +1316,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1345,17 +1353,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1481,27 +1489,27 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Red</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 6a23f9c..e87d491 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -596,17 +596,17 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -1247,7 +1247,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -1271,9 +1271,17 @@ Selle kasutamine pole soovitatav.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Fail või kataloog oli eemaldatud kirjutamisõiguseta jagamisest, kuid taastamine ebaõnnestus: %1</translation>
</message>
@@ -1281,12 +1289,12 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>ei suuda luua kataloogi %1</translation>
</message>
@@ -1294,7 +1302,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Kausta %1 ei saa eemaldada</translation>
</message>
@@ -1302,7 +1310,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Fail oli eemaldatud kirjutamisõiguseta kataloogist. See on nüüd taastatud.</translation>
</message>
@@ -1310,17 +1318,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Kausta ei tohi ümber nimetada. Kausta algne nimi taastati.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Kausta nime ei tohi muuta. Palun pane selle nimeks tagasi Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Fail oli ümber nimetatud, kuid see on osa kirjutamisõiguseta jagamisest. Algne fail taastati.</translation>
</message>
@@ -1347,17 +1355,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Server ei tunnistanud viimast tükki. (E-silt puudus).</translation>
</message>
@@ -1483,27 +1491,27 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Toimingud</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Üldine</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Võrk</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 90fca1b..b7b9124 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1242,7 +1242,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1266,9 +1266,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1276,12 +1284,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>Ezin izan da %1 karpeta sortu</translation>
</message>
@@ -1289,7 +1297,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Ezin izan da %1 karpeta ezabatu</translation>
</message>
@@ -1297,7 +1305,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1305,17 +1313,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Karpeta hau ezin da berrizendatu. Bere jatorrizko izenera berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Karpeta hau ezin da berrizendatu. Mesedez jarri berriz Shared izena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1342,17 +1350,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1478,27 +1486,27 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Kontua</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Jarduera</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Orokorra</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Sarea</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 341d3ef..b1f90bb 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1240,7 +1240,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1264,9 +1264,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1274,12 +1282,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1287,7 +1295,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,7 +1303,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1303,17 +1311,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1340,17 +1348,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1475,27 +1483,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>حساب کاربری</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>قعالیت</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>عمومی</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 1cc9013..c931f67 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -1242,7 +1242,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -1266,9 +1266,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1276,12 +1284,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>kansion %1 luominen epäonnistui</translation>
</message>
@@ -1289,7 +1297,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Kansion %1 poistaminen epäonnistui</translation>
</message>
@@ -1297,7 +1305,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1305,17 +1313,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1342,17 +1350,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1477,27 +1485,27 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Tili</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Toimet</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Yleiset</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Verkko</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 459d99e..797dc08 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -596,19 +596,19 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
- <translation type="unfinished"/>
+ <translation>Temps de connexion expiré</translation>
</message>
</context>
<context>
@@ -1247,9 +1247,9 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
- <translation type="unfinished"/>
+ <translation>Temps de connexion expiré</translation>
</message>
</context>
<context>
@@ -1271,9 +1271,17 @@ Il est déconseillé de l'utiliser.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Un fichier ou un dossier a été supprimé du partage en lecture seule, mais la restauration à échoué : %1</translation>
</message>
@@ -1281,12 +1289,12 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
- <translation type="unfinished"/>
+ <translation>Attention, collision possible avec %1 à cause de la casse</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>impossible de créer le répertoire %1</translation>
</message>
@@ -1294,7 +1302,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Impossible de supprimer le dossier %1</translation>
</message>
@@ -1302,7 +1310,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Le fichier a été supprimé d'un partage en lecture seule. Il a été restauré.</translation>
</message>
@@ -1310,17 +1318,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Ce dossier ne doit pas être renommé. Veuillez le nommer Partagé uniquement.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré.</translation>
</message>
@@ -1347,17 +1355,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge 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>
@@ -1483,27 +1491,27 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Compte</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Activité</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Général</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Réseau</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 4d4a520..185fb15 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -596,17 +596,17 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -1247,7 +1247,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -1271,9 +1271,17 @@ Recomendámoslle que non o use.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Foi retirado un ficheiro ou directorio desde unha compartición de só lectura, mais non foi posíbel a súa restauración: %1</translation>
</message>
@@ -1281,12 +1289,12 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, posíbel colisión entre maiúsculas e minúsculas con %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>non foi posíbel crear o directorio %1</translation>
</message>
@@ -1294,7 +1302,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Non foi posíbel retirar o directorio %1</translation>
</message>
@@ -1302,7 +1310,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Foi retirado un ficheiro desde unha compartición de só lectura. Foi restaurado.</translation>
</message>
@@ -1310,17 +1318,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Non é posíbel renomear este cartafol. Devólvalle o nome ao compartido.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado.</translation>
</message>
@@ -1347,17 +1355,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>O ficheiro local cambiou durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presentes)</translation>
</message>
@@ -1483,27 +1491,27 @@ Tente sincronizalos de novo.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Actividade</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Xeral</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Rede</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index af695a4..12f8dfc 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1240,7 +1240,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1264,9 +1264,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1274,12 +1282,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1287,7 +1295,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,7 +1303,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1303,17 +1311,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1340,17 +1348,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1475,27 +1483,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Fiók</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Aktivitás</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Általános</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Hálózat</translation>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index fadf296..d87a9f2 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -596,17 +596,17 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -1246,7 +1246,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -1270,9 +1270,17 @@ Non è consigliabile utilizzarlo.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Un file o una cartella è stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1</translation>
</message>
@@ -1280,12 +1288,12 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Attenzione, possibile conflitto relativo all'uso di maiuscole e minuscole con %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>impossibile creare la cartella %1</translation>
</message>
@@ -1293,7 +1301,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Impossibile rimuovere la cartella %1</translation>
</message>
@@ -1301,7 +1309,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Il file è stato rimosso da una condivisione in sola lettura. È stato ripristinato.</translation>
</message>
@@ -1309,17 +1317,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Questa cartella non può essere rinominata. Il nome originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Questa cartella non può essere rinominata. Ripristina il nome Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato.</translation>
</message>
@@ -1346,17 +1354,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Un file locale è cambiato durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Nessun e-tag era presente)</translation>
</message>
@@ -1482,27 +1490,27 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Account</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Attività</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Generale</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Rete</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 0094372..b2eb5a5 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -597,17 +597,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -1246,7 +1246,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -1270,9 +1270,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>ファイルまたはディレクトリが読み込み専用の共有から削除されましたが、復元に失敗しました: %1</translation>
</message>
@@ -1280,12 +1288,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>ディレクトリ %1 を作成できませんでした</translation>
</message>
@@ -1293,7 +1301,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>ディレクトリ %1 を削除できません</translation>
</message>
@@ -1301,7 +1309,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>ファイルが読み込み専用の共有から削除されました。ファイルは復元されました。</translation>
</message>
@@ -1309,17 +1317,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダー名は変更できません。元の名前に戻します。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。</translation>
</message>
@@ -1346,17 +1354,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しませんでした。（e-tag が存在しませんでした）</translation>
</message>
@@ -1482,27 +1490,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>アカウント</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>ネットワーク</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 4d06e43..5ccf354 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -596,17 +596,17 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -1247,7 +1247,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -1271,9 +1271,17 @@ We adviseren deze site niet te gebruiken.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Er is een bestand of map verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation>
</message>
@@ -1281,12 +1289,12 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Let op, mogelijk conflict hoofdlettergevoeligheid met 1%</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>kon map %1 niet maken</translation>
</message>
@@ -1294,7 +1302,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Kon map %1 niet verwijderen</translation>
</message>
@@ -1302,7 +1310,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Het bestand is verwijderd van een alleen-lezen share. Het is teruggezet.</translation>
</message>
@@ -1310,17 +1318,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Deze map mag niet worden hernoemd. Verander de naam terug in Gedeeld.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet.</translation>
</message>
@@ -1347,17 +1355,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge 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>
@@ -1483,27 +1491,27 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Account</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Netwerk</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index ced26b2..c6cd337 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -596,17 +596,17 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -1247,7 +1247,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -1271,9 +1271,17 @@ Niezalecane jest jego użycie.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Plik lub katalog został usunięty z udziału z prawem tylko do odczytu, ale przywrócenie nie powiodło się: %1</translation>
</message>
@@ -1281,12 +1289,12 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Uwaga, możliwa niezgodność związana z wielością liter w %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>nie można utworzyć katalogu %1</translation>
</message>
@@ -1294,7 +1302,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Nie mogę usunąć katalogu %1</translation>
</message>
@@ -1302,7 +1310,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Plik został usunięty z zasobu z prawem tylko do odczytu. Został przywrócony.</translation>
</message>
@@ -1310,17 +1318,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Folder ten nie może być zmieniony. Został zmieniony z powrotem do pierwotnej nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Przywrócono oryginalny plik</translation>
</message>
@@ -1347,17 +1355,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge 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>
@@ -1483,27 +1491,27 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Aktywność</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Ogólne</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Sieć</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 284d451..d0ed88e 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -595,17 +595,17 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhum E-Tag recebido do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tentando uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou </translation>
</message>
@@ -1244,7 +1244,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou</translation>
</message>
@@ -1268,9 +1268,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Um ficheiro ou um directório foi removido de uma partilha apenas de leitura, mas o restauro falhou: %1</translation>
</message>
@@ -1278,12 +1286,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar a directoria %1</translation>
</message>
@@ -1291,7 +1299,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Não foi possível remover a directoria %1</translation>
</message>
@@ -1299,7 +1307,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>O ficheiro havia sido removido de uma partilha apenas de leitura. Ficheiro restaurado. </translation>
</message>
@@ -1307,17 +1315,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. A alterar para nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor renomeie para o seu nome original: Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mas faz parte de uma partilha só de leitura. O ficheiro original foi restaurado.</translation>
</message>
@@ -1344,17 +1352,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mas faz parte de uma prtilha só de leitura. Foi restaurado mas a edição está no ficheiro de conflito.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Ficheiro local alterado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1480,27 +1488,27 @@ Por favor tente sincronizar novamente.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Actividade</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Rede</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 3b6eb63..3e87067 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -596,17 +596,17 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
@@ -1245,7 +1245,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
@@ -1269,9 +1269,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Um arquivo ou diretório foi removido de um compartilhamento somente de leitura, mas a restauração falhou: %1</translation>
</message>
@@ -1279,12 +1287,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Atenção, possível caso de sensibilidade de minúscula/maiúscula, choque com 1%</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar diretório %1</translation>
</message>
@@ -1292,7 +1300,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>O diretório %1 não pode ser removido</translation>
</message>
@@ -1300,7 +1308,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>O arquivo foi removido de um compartilhamento somente de leitura. Ele foi restaurado.</translation>
</message>
@@ -1308,17 +1316,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. Ele será renomeado de volta ao seu nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor, nomeie-a de volta para Compartilhada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O arquivo foi renomeado mas faz parte de compartilhamento só de leitura. O arquivo original foi restaurado.</translation>
</message>
@@ -1345,17 +1353,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Arquivo local modificado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último pedaço. (Nenhuma e-etiqueta estava presente)</translation>
</message>
@@ -1481,27 +1489,27 @@ Tente sincronizar novamente.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Rede</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 2c9f3f4..0ada74b 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -596,17 +596,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1247,7 +1247,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,9 +1271,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1281,12 +1289,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>не удалось создать директорию %1</translation>
</message>
@@ -1294,7 +1302,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Невозможно удалить директорию %1</translation>
</message>
@@ -1302,7 +1310,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1310,17 +1318,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1347,17 +1355,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1483,27 +1491,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Учётная запись</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Действие</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Основные</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Сеть</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 76b9067..cbd1c2e 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -596,17 +596,17 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1247,7 +1247,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,9 +1271,17 @@ Nie je vhodné ju používať.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Súbor alebo priečinok bol odobratý zo zdieľania len na čítanie, ale jeho obnovenie zlyhalo: %1</translation>
</message>
@@ -1281,12 +1289,12 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>nepodarilo sa vytvoriť priečinok %1</translation>
</message>
@@ -1294,7 +1302,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Nemožno odstrániť priečinok %1</translation>
</message>
@@ -1302,7 +1310,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Súbor bol odobratý zo zdieľania len na čítanie. Súbor bol obnovený.</translation>
</message>
@@ -1310,17 +1318,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu meno Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Súbor bol premenovaný, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený.</translation>
</message>
@@ -1347,17 +1355,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Súbor bol zmenený, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený a upravená verzia je uložená v konfliktnom súbore.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Lokálny súbor bol zmenený počas synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil poslednú časť dát. (Nebol nájdený e-tag)</translation>
</message>
@@ -1482,27 +1490,27 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Účet</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Všeobecné</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Sieť</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 8ba59f2..7f01a6c 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -596,17 +596,17 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1247,7 +1247,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,9 +1271,17 @@ Uporaba ni priporočljiva.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Datoteka ali mapa je bila odstranjena iz mesta v souporabi, ki je nastavljeno le za branje, obnavljanje pa je spodletelo: %1</translation>
</message>
@@ -1281,12 +1289,12 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>ni mogoče ustvariti mape %1</translation>
</message>
@@ -1294,7 +1302,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>ni mogoče odstraniti mape %1</translation>
</message>
@@ -1302,7 +1310,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Datoteka je bila odstranjena iz mesta v souporabi, vendar je uspešno obnovljena.</translation>
</message>
@@ -1310,17 +1318,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Mape ni dovoljeno preimenovati. Preimenujte jo nazaj na privzeto vrednost.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Datoteka je preimenovana, vendar je označena za souporabo le za branje. Obnovljena je izvirna datoteka.</translation>
</message>
@@ -1347,17 +1355,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Datoteka je bila krajevno spremenjena, vendar pa je označena za souporabo le za branje. Izvorna datoteka je obnovljena, vaše spremembe pa so zabeležene v datoteki spora.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Ni prejetega odziva s strežnnika s potrdilom o prejemu zadnjega dela datoteke (ni prejete oznake).</translation>
</message>
@@ -1483,27 +1491,27 @@ Te je treba uskladiti znova.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Račun</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Dejavnosti</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Splošno</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Omrežje</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 7ec2ab6..b5d60db 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -596,17 +596,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ingen e-tag mottogs från servern, kontrollera proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -1247,7 +1247,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -1271,9 +1271,17 @@ Det är inte lämpligt använda den.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>En fil eller katalog togs bort från en endast-läsbar delning, men återställning misslyckades: %1</translation>
</message>
@@ -1281,12 +1289,12 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Observera, eventuell skiftlägeskänslig konflikt med %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>kunde ej skapa katalogen %1</translation>
</message>
@@ -1294,7 +1302,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>Kunde ej ta bort mappen %1</translation>
</message>
@@ -1302,7 +1310,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Den här filen har tagits bort från en endast-läsbar delning. Den återställdes.</translation>
</message>
@@ -1310,17 +1318,17 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denna mapp får inte byta namn. Den kommer att döpas om till sitt ursprungliga namn.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Denna mapp får ej döpas om. Vänligen döp den till Delad igen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>En fil döptes om men är en del av en endast-läsbar delning. Original filen återställdes.</translation>
</message>
@@ -1347,17 +1355,17 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Filen ändrades lokalt men är en del av en endast-läsbar delning. Den återställdes och din editering är i konflikt filen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Servern erkände inte den sista biten. (Ingen e-tag var närvarande)</translation>
</message>
@@ -1483,27 +1491,27 @@ Försök att synka dessa igen.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Allmänt</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Nätverk</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index f97a4d8..0c9cffa 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1240,7 +1240,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1264,9 +1264,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1274,12 +1282,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1287,7 +1295,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,7 +1303,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1303,17 +1311,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1340,17 +1348,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1475,27 +1483,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>ทั่วไป</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 8bbdd44..9f234e4 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -596,17 +596,17 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket altık. Sonraki işlemde yeniden denenecek.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>Bağlantı zamanaşımı</translation>
</message>
@@ -1246,7 +1246,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>Bağlantı zamanaşımı</translation>
</message>
@@ -1270,9 +1270,17 @@ Kullanmanız önerilmez.</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Bir dosya veya dizin bir salt okunur paylaşımdan kaldırılmıştı, ancak geri yükleme başarısız oldu: %1</translation>
</message>
@@ -1280,12 +1288,12 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Uyarı, %1 ile muhtemel harf duyarlılığı çatışması</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation>%1 dizini oluşturulamadı</translation>
</message>
@@ -1293,7 +1301,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation>%1 dizini kaldırılamadı</translation>
</message>
@@ -1301,7 +1309,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Dosya salt okunur bir paylaşımdan kaldırılmıştı. Geri yüklendi.</translation>
</message>
@@ -1309,17 +1317,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Lütfen Paylaşılan olarak geri adlandırın.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Dosya adlandırıldı ancak salt okunur paylaşımın bir parçası. Özgün dosya geri yüklendi.</translation>
</message>
@@ -1346,17 +1354,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>Eşitleme sırasında yerel dosya değişti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
@@ -1482,27 +1490,27 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>Hesap</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Etkinlik</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Genel</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>Ağ</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index e2e981a..c043d1b 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1240,7 +1240,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1264,9 +1264,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1274,12 +1282,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1287,7 +1295,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,7 +1303,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1303,17 +1311,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1340,17 +1348,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1475,27 +1483,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>Активність</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>Загалом</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 75e01dd..6334fad 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -1240,7 +1240,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -1264,9 +1264,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1274,12 +1282,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1287,7 +1295,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,7 +1303,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1303,17 +1311,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1340,17 +1348,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1475,27 +1483,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>账户</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>动态</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>常规</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</source>
<translation>网络</translation>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 6c80561..3711251 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="392"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="399"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="627"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="633"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1240,7 +1240,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="81"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1264,9 +1264,17 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PropagateDownloadFileQNAM</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="152"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1274,12 +1282,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="117"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1287,7 +1295,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="86"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,7 +1303,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="137"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1303,17 +1311,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="228"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="230"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="225"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1340,17 +1348,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="246"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="271"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="281"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1475,27 +1483,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="30"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="28"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="34"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="32"/>
<source>Account</source>
<translation>帳號</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="38"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="36"/>
<source>Activity</source>
<translation>活動</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="42"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="40"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="46"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="44"/>
<source>Network</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