[Pkg-owncloud-commits] [owncloud-client] 55/83: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat May 31 11:31:43 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 9a1f8ccf7b7dc1f19203d88c84e39dd04f76844b
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Tue May 27 01:25:28 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_cs.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_de.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_el.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_en.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_es.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_es_AR.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_et.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_eu.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_fa.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_fi.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_fr.ts | 112 +++++++++++++++++++++++++------------------
translations/mirall_gl.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_hu.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_it.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_ja.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_nl.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_pl.ts | 112 +++++++++++++++++++++++++------------------
translations/mirall_pt.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_pt_BR.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_ru.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_sk.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_sl.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_sv.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_th.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_tr.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_uk.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_zh_CN.ts | 106 +++++++++++++++++++++++-----------------
translations/mirall_zh_TW.ts | 106 +++++++++++++++++++++++-----------------
29 files changed, 1804 insertions(+), 1282 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 2999e4a..73a0dd7 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>No s'ha pogut crear el context-csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>El fitxer local %1 no existeix.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 hauria de ser una carpeta, però no ho és.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 altres fitxers s'han esborrat</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>S'ha esborrat '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 altres fitxers s'han descarregat.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>S'ha descarregat %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 i %2 altres fitxer(s) s'han actualitzat.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>S'ha actualitzat %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Aquesta sincronització eliminarà tots els fitxers a la carpeta local de sincronització '%1'.
Si vós o l'administrador heu reinicialitzat el compte en el servidor, escolliu "Mantenir fitxers". Si voleueliminar les dades, escolliu "Esborra tots els fitxers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -380,67 +380,67 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>No es pot restablir l'estat de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Espera per començar la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Perparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>El servidor no està disponible actualment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronització ha estat un èxit, però amb avisos en fitxers individuals.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
@@ -786,12 +786,12 @@ Els elements marcats també s'eliminaran si prevenen l'eliminació d&a
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>El fitxer '%1'<br/>no es pot obrir en mode escriptura.<br/><br/>La sortida del registre <b>no</b> es pot desar!</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ No és aconsellada usar-la.</translation>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1289,12 +1294,12 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>No s'ha pogut crear el directori %1</translation>
</message>
@@ -1302,15 +1307,28 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>No s'ha pogut esborrar la carpeta %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1318,17 +1336,17 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 27fe006..cecbe17 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Nepodařilo se vytvořit csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Místní složka %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 by měl být adresář, ale není.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 dalších souborů bylo odebráno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl odebrán.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 dalších souborů bylo staženo.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl stažen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 a %2 dalších souborů bylo aktualizováno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl aktualizován.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 byl přejmenován na %2 a %3 dalších souborů bylo přejmenováno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 byl přejmenován na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 byl přesunut do %2 a %3 dalších souborů bylo přesunuto.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 byl přemístěn do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Tato synchronizace by smazala všechny soubory v místní složce '%1'
Pokud jste vy nebo váš správce zresetovali účet na serveru, zvolte "Ponechat soubory". Pokud chcete místní data odstranit, zvolte "Odstranit všechny soubory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -380,67 +380,67 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Nelze obnovit stav složky</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Vyčkává na spuštění synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Server je nyní nedostupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
@@ -786,12 +786,12 @@ Zvolené položky budou smazány také v případě, že brání smazání adres
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Soubor '%1'<br/>nelze otevřít pro zápis.<br/><br/>Výstup záznamu <b>nelze</b> uložit.</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ Nedoporučuje se jí používat.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>nepodařilo se vytvořit adresář %1</translation>
</message>
@@ -1302,15 +1307,28 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Nepodařilo se odstranit adresář %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index ce403e9..1b19164 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -261,100 +261,100 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Kann keinen CSync-Kontext erstellen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokales Verzeichnis %1 existiert nicht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 sollte ein Verzeichnis sein, ist es aber nicht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 und %2 andere Dateien wurden aktualisiert.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde aktualisiert.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 wurde in %2 umbenannt und %3 andere Dateien wurden umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 wurde in %2 umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 wurde in %2 verschoben und %3 andere Dateien wurden verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Dieser Synchronisationsvorgang würde alle Dateien in dem lokalen Ordner '%1' entfernen.
Wenn Sie oder Ihr Administrator Ihr Konto auf dem Server zurückgesetzt haben, wählen Sie "Dateien behalten". Wenn Sie ihre Daten löschen wollen, wählen Sie "Alle Dateien entfernen".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -363,17 +363,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -381,67 +381,67 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Wartet auf Beginn der Synchronistation</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Der Server ist momentan nicht erreichbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Setup-Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
@@ -787,12 +787,12 @@ Aktivierte Elemente werden ebenfalls gelöscht, wenn diese das Löschen eines Ve
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Datei '%1'<br/>kann nicht zum Schreiben geöffnet werden.<br/><br/>Die Protokolldatei kann <b>nicht</b> gespeichert werden!</nobr></translation>
</message>
@@ -1270,6 +1270,11 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1282,7 +1287,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1290,12 +1295,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<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="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
</message>
@@ -1303,15 +1308,28 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Verzeichnis %1 konnte nicht entfernt werden</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1319,17 +1337,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index d706378..45eab30 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Αδυναμία δημιουργίας πλαισίου csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 επρεπε να ειναι χωρος αποθηκευσης αλλα δεν ειναι.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation> %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 και άλλα %2 αρχεία διαγράφηκαν.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει διαγραφεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το αρχείο %1 και άλλα %2 αρχεία έχουν μεταφορτωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το αρχείο %1 έχει μεταφορτωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Το αρχείο %1 και %2 άλλα αρχεία έχουν ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το αρχείο %1 έχει ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>Το αρχείο %1 έχει μετονομαστεί σε %2 και άλλα %3 αρχεία έχουν μετονομαστεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Το αρχείο %1 έχει μετονομαστεί σε %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>Το αρχείο %1 έχει μετακινηθεί στο %2 και %3 άλλα αρχεία έχουν μετακινηθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>Το αρχείο %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Αυτός ο συγχρονισμός θα αφαιρέσει όλα τα αρχεία στον τοπικό φάκελο συγχρονισμού '%1'.
Εάν εσείς ή ο διαχειριστής σας επαναφέρατε τον λογαριασμό σας στο διακομιστή, επιλέξτε "Διατήρηση αρχείων". Εάν θέλετε να αφαιρεθούν τα δεδομένα σας, επιλέξτε "Αφαίρεση όλων των αρχείων".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -380,67 +380,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμια εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη κατάσταση.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Ο διακομιστής δεν είναι διαθέσιμος προς το παρόν.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Ο Συγχρονισμός Παύθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμούς)</translation>
</message>
@@ -786,12 +786,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Το αρχειο '%1'<br/>δεν μπορει να ανοιχθει για το γραψιμο.<br/><br/>Το αρχείο καταγραφής δεν <b>μπορεί</b> να αποθηκευτεί!</nobr> </translation>
</message>
@@ -1269,6 +1269,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Ένα αρχείο ή ένας κατάλογος αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση, αλλά η επαναφορά απέτυχε: %1</translation>
</message>
@@ -1289,12 +1294,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>αδυναμία δημιουργίας καταλόγου %1</translation>
</message>
@@ -1302,15 +1307,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Αδυναμία αφαίρεσης καταλόγου %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Το αρχείο διαγράφηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση. Το αρχείο επαναφέρθηκε.</translation>
</message>
@@ -1318,17 +1336,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Το αρχείο μετονομάστηκε αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Το αρχικό αρχείο επαναφέρθηκε.</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 99397d8..3b97f55 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -262,116 +262,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -379,67 +379,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
@@ -783,12 +783,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation type="unfinished"></translation>
</message>
@@ -1264,6 +1264,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1276,7 +1281,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1284,12 +1289,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1297,15 +1302,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"></translation>
</message>
@@ -1313,17 +1331,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index bdede42..0637eaa 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Carpeta local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido eliminados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido descargados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 y %2 otros archivos han sido actualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 ha sido renombrado a %2 y %3 otros archivos han sido renombrados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ha sido renombrado a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 ha sido movido a %2 y %3 otros archivos han sido movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización eliminaría todos los archivos en la carpeta local de sincronización '%1'.
Si ud. o su administrador han restablecido su cuenta en el servidor, elija "Conservar Archivos". Si desea eliminar toda su información, elija "Eliminar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -380,67 +380,67 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>No se ha podido restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un antiguo registro (journal) de sincronización '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Esperando el inicio de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>El servidor no está disponible en el momento</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronización fue exitosa pero con advertencias para archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -786,12 +786,12 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Archivo '%1'<br/>no se puede abrir para escritura.<br/><br/>¡El archivo de registro <b>no</b> puede ser guardado!</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ No se recomienda usarlo.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<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="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>No se pudo crear el directorio %1</translation>
</message>
@@ -1302,15 +1307,28 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>No se pudo eliminar el directorio %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 9b2db0c..3eec950 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>El directorio local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización borraría todos los archivos en la carpeta local de sincronización '%1'.
Si vos o el administrador resetearon tu cuenta en el servidor, elegí "Conservar Archivos". Si querés borrar toda tu información, elegí "Borrar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -380,67 +380,67 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>No se pudo </translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Esperando el comienzo de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>El servidor actualmente no está disponible.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -786,12 +786,12 @@ Los elementos marcados también se borrarán si impiden la eliminación de algú
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>El archivo '%1'<br/>no puede ser abierto para escritura.<br/><br/>¡El archivo de log <b>no</b> puede ser guardado!</nobr></translation>
</message>
@@ -1267,6 +1267,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1279,7 +1284,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1287,12 +1292,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1300,15 +1305,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1316,17 +1334,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 120c03a..d0f6a0d 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Ei suuda luua csync-konteksti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Kohalikku kausta %1 pole olemas.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 peaks olema kataloog, kuid pole seda mitte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 teist faili eemaldati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on eemaldatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 teist faili on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ja %2 teist faili on uuendatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on uuendatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 on ümber nimetatud %2 ja %3 muud faili on samuti ümber nimetatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on ümber nimetatud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 on tõstetud %2 ning %3 muud faili on samuti liigutatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>See sünkroniseering kustutab kõik failid kohalikust kataloogist '%1'.⏎
Kui sina või adminstraator on sinu konto serveris algseadistanud, siis vali "Säilita failid". Kui soovid oma andmed kustutada, vali "Kustuta kõik failid".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -380,67 +380,67 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Ei suutnud tühistada kataloogi staatust</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Ootab sünkroniseerimise alustamist.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Server pole hetkel saadaval.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
@@ -786,12 +786,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Viga</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Faili '%1'<br/>ei saa kirjutamiseks avada.<br/><br/>Logi väljundit <b>ei saa</b> salvestada!</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ Selle kasutamine pole soovitatav.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>ei suuda luua kataloogi %1</translation>
</message>
@@ -1302,15 +1307,28 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Kausta %1 ei saa eemaldada</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index b79089c..abd7cec 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Bertako %1 karpeta ez da existitzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 karpeta bat izan behar zen baina ez da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ezabatua izan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2-(e)ra mugitu da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Ezin izan da karpetaren egoera berrezarri</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Zerbitzaria orain ez dago eskuragarri.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Erabiltzaileak Bertan Behera Utzi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
@@ -783,12 +783,12 @@ Markatutakoak ezabatuko dira karpeta bat ezabatzeko beharrezkoa bada. Hau meta d
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Errorea</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>'%1' Fitxategia<br/> ezin da idazteko ireki.<br/><br/>Egunkariaren irteera <b>ezin</b> da gorde!</nobr></translation>
</message>
@@ -1264,6 +1264,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1276,7 +1281,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1284,12 +1289,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>Ezin izan da %1 karpeta sortu</translation>
</message>
@@ -1297,15 +1302,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Ezin izan da %1 karpeta ezabatu</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1313,17 +1331,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 4f4e250..83c38fc 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>پوشه محلی %1 موجود نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 باید یک پوشه باشد اما نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>صبر کنید تا همگام سازی آغاز شود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -781,12 +781,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>خطا</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation type="unfinished"/>
</message>
@@ -1262,6 +1262,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1274,7 +1279,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1282,12 +1287,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,15 +1300,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1311,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index d32f9a9..8a8a882 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Paikallista kansiota %1 ei ole olemassa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on poistettu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on ladattu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on päivitetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on nimetty uudeelleen muotoon %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Kansion tilaa ei voitu alustaa</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Odottaa synkronoinnin alkamista.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Palvelin ei ole käytettävissä.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
@@ -781,12 +781,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Virhe</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Tiedostoa '%1'<br/>ei voida avata kirjoittamista varten.<br/><br/>Lokitulostusta<b>ei</b>pystytä tallentamaan!</nobr></translation>
</message>
@@ -1264,6 +1264,11 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1276,7 +1281,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1284,12 +1289,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>kansion %1 luominen epäonnistui</translation>
</message>
@@ -1297,15 +1302,28 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Kansion %1 poistaminen epäonnistui</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1313,17 +1331,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 1a8487c..6b5afd9 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Impossible de créer le contexte csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Le dossier local %1 n'existe pas.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 doit être un répertoire, mais ce n'en ai pas un.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont été supprimés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été supprimé.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont été téléchargés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été téléchargé.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 et %2 autres fichiers ont été mis à jour.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été mis à jour.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 a été renommé en %2 et %3 autres fichiers ont été renommés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 a été renommé en %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 a été déplacé vers %2 et %3 autres fichiers ont été déplacés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a été déplacé vers %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Cette synchronisation supprimerait tous les fichiers du dossier local de synchronisation '%1'.
Si vous-même ou votre administrateur avez réinitialisé votre compte sur le serveur, choisissez "Garder les fichiers". Si vous voulez que vos données soient supprimées, choisissez "Supprimer tous les fichiers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -380,67 +380,67 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Impossible de réinitialiser l'état du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Le serveur est indisponible actuellement.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Dernière synchronisation effectuée avec succès</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La dernière synchronisation s'est achevée avec succès mais avec des messages d'avertissement sur des fichiers individuels.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
@@ -513,7 +513,7 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="139"/>
<source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>Le dossier sélectionné est un lien symbolique. Une configuration du dossier existe déjà dans le dossier portant vers ce même lien.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
@@ -786,12 +786,12 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Le fichier '%1'<br/>ne peut être ouvert en écriture.<br/><br/>La sortie <b>ne peut pas</b> être consignée dans un fichier de log !</nobr></translation>
</message>
@@ -1269,19 +1269,24 @@ Il est déconseillé de l'utiliser.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </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>File %1 ne peut pas être téléchargé en raison d'un conflit sur le nom du fichier local. </translation>
</message>
</context>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Attention, collision possible avec %1 à cause de la casse</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>impossible de créer le répertoire %1</translation>
</message>
@@ -1302,15 +1307,28 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Impossible de supprimer le dossier %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
@@ -1367,7 +1385,7 @@ Il est déconseillé de l'utiliser.</translation>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation type="unfinished"/>
+ <translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 8de8963..4d80545 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Non é posíbel crear o contexto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>O cartafol local %1 non existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio e non o é.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron retirados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron descargados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>O ficheiro %1 e outros %2 foron enviados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado satisfactoriamente a %2 e outros %3 tamén foron renomeados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido satisfactoriamente a %2 e outros %3 tamén foron movidos satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización retirará todos os ficheiros do cartafol local de sincronización «%1».
Se vostede, ou o administrador, restabeleceu a súa conta no servidor, escolla «Manter os ficheiros». Se quere que os seus datos sexan eliminados, escolla «Retirar todos os ficheiros».</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -380,67 +380,67 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Non foi posíbel restabelecer o estado do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningún aplicativo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Agardando polo comezo da sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>O servidor non está dispoñíbel actualmente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
@@ -786,12 +786,12 @@ Os elementos marcados tamén se eliminarán se impiden retirar un directorio. Is
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>O ficheiro «%1»<br/> non se pode abrir para escritura.<br/><br/>A saída do rexistro <b>non</n> se pode gardar!</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ Recomendámoslle que non o use.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<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="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>non foi posíbel crear o directorio %1</translation>
</message>
@@ -1302,15 +1307,28 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Non foi posíbel retirar o directorio %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 840661a..01a0af5 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 helyi mappa nem létezik.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 könyvtár kell legyen, de nem az.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>El legyen távolítva az összes fájl?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Várakozás a szinkronizálás elindítására.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>A kiszolgáló jelenleg nem érhető el.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -781,12 +781,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Hiba</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>'%1' fájlt<br/>nem lehet írásra megnyitni.<br/><br/>A naplózás kimenete <b>nem</b> menthető!</nobr></translation>
</message>
@@ -1262,6 +1262,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1274,7 +1279,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1282,12 +1287,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,15 +1300,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1311,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index c808db4..ecd8e79 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Impossibile creare il contesto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>La cartella locale %1 non esiste.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 dovrebbe essere una cartella.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati rimossi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato rimosso.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati scaricati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato scaricato.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 altri file sono stati aggiornati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato aggiornato.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 è stato rinominato in %2 e %3 altri file sono stati rinominati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 è stato rinominato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 è stato spostato in %2 e %3 altri file sono stati spostati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Questa sincronizzazione rimuoverà tutti i file nella cartella di sincronizzazione locale '%1'.
Se tu o il tuo amministratore avete ripristinato il tuo account sul server, scegli "Mantieni i file". Se desideri che i dati siano rimossi, scegli "Rimuovi tutti i file".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -380,67 +380,67 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Impossibile ripristinare lo stato della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Attende l'inizio della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Il server è attualmente non disponibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stato completata correttamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
@@ -786,12 +786,12 @@ Gli elementi marcati saranno inoltre eliminati se impediscono la rimozione di un
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Il file '%1'<br/>non può essere aperto in scrittura.<br/><br/>Il risultato del log <b>non</b> può essere salvato!</nobr></translation>
</message>
@@ -1268,6 +1268,11 @@ Non è consigliabile utilizzarlo.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1280,7 +1285,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1288,12 +1293,12 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<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="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>impossibile creare la cartella %1</translation>
</message>
@@ -1301,15 +1306,28 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Impossibile rimuovere la cartella %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1317,17 +1335,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 57a5765..12c80ad 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>csync-context を作成できません</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 はディレクトリのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 と他 %2 個のファイルが削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 と他 %2 個のファイルがダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 と他 %2 個のファイルが更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 の名前が %2 に変更され、他 %3 個のファイルの名前が変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 が %2 に移され、他 %3 個のファイルが移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>この同期により、ローカルの同期フォルダー '%1'にある全ファイルが削除されます。
あなた、または管理者がサーバー上のアカウントをリセットした場合、「ファイルを残す」を選んでください。データを削除したい場合は、「すべてのファイルを削除」を選んでください。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -380,67 +380,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>フォルダーの状態をリセットできませんでした</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>サーバーは現在利用できません。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
@@ -787,12 +787,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>ファイル '%1'<br/>を書き込み用で開けませんでした。<br/><br/>ログ出力を<b>保存できません</b>でした！</nobr></translation>
</message>
@@ -1268,6 +1268,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1280,7 +1285,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>ファイルまたはディレクトリが読み込み専用の共有から削除されましたが、復元に失敗しました: %1</translation>
</message>
@@ -1288,12 +1293,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>ディレクトリ %1 を作成できませんでした</translation>
</message>
@@ -1301,15 +1306,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>ディレクトリ %1 を削除できません</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>ファイルが読み込み専用の共有から削除されました。ファイルは復元されました。</translation>
</message>
@@ -1317,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index e4a29e0..f13cf46 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Onmogelijk om een csync-context te maken</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokale map %1 bestaat niet.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 zou een map moeten zijn, maar is dit niet.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn verwijderd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 is verwijderd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn gedownloaded.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 is gedownloaded.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 en %2 andere bestanden zijn bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 is bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 is hernoemd naar %2 en %3 andere bestanden zijn ook hernoemd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 is hernoemd naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 is verplaatst naar %2 en %3 andere bestanden zijn ook verplaatst.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Deze synchronisatie verwijdert alle bestanden in lokale synchronisatiemap '%1'.
Als u of uw beheerder uw account op de server heeft gereset, kies dan "Bewaar bestanden". Als u uw bestanden wilt verwijderen, kies dan "Verwijder alle bestanden".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle besta
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -380,67 +380,67 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Kan de beginstaat van de map niet terugzetten</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>De server is nu niet beschikbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was succesvol.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
@@ -786,12 +786,12 @@ Aangevinkte onderdelen zullen ook gewist worden als ze anders verhinderen dat ee
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Bestand '%1'<br/>kan niet worden geopend voor schrijven.<br/><br/>De logging output kan <b>niet</b> worden weggeschreven!</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ We adviseren deze site niet te gebruiken.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<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="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>kon map %1 niet maken</translation>
</message>
@@ -1302,15 +1307,28 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Kon map %1 niet verwijderen</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 74c38de..768a433 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Nie można utworzyć kontekstu csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Folder lokalny %1 nie istnieje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 powinien być katalogiem, ale nie jest.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 inne pliki zostały usunięte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 został usunięty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 pozostałe pliki zostały ściągnięte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 został ściągnięty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 i %2 inne pliki zostały zaktualizowane.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 został uaktualniony.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 zmienił nazwę na %2 i %3 inne pliki mają zmienione nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 zmienił nazwę na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 został zmieniony na %2 i %3 inne pliku zostały przeniesione.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Ta synchronizacja usunie wszystkie pliku z lokalnego folderu synchronizacji '%1'.
Jeśli Ty lub Twój administrator zresetowali Twoje konto na serwerze, wybierz "Zachowaj pliki". Jeśli chcesz aby Twoje dane zostały usunięte, wybierz "Usuń wszystkie pliki".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te
Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -380,67 +380,67 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Nie udało się zresetować stanu folderu</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Czekają na uruchomienie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Serwer jest obecnie niedostępny.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
@@ -513,7 +513,7 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="139"/>
<source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>Zaznaczony folder jest linkiem symbolicznym. Skonfigurowany folder jest tym, na który wskazuje ten link.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
@@ -786,12 +786,12 @@ Zaznaczone przedmioty także będą usunięte, jeżeli będą przeszkadzać w us
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Błąd</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Plik '%1'<br>nie może zostać otwarty do zapisu.<br/><br/>Dane wyjściowe dziennika <b>nie</b> mogą być zapisane!</nobr></translation>
</message>
@@ -1269,19 +1269,24 @@ Niezalecane jest jego użycie.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </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>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation>
</message>
</context>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<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="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>nie można utworzyć katalogu %1</translation>
</message>
@@ -1302,15 +1307,28 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Nie mogę usunąć katalogu %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
@@ -1367,7 +1385,7 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation type="unfinished"/>
+ <translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 7bced24..e785bcb 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Impossível criar 'csync-context'</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 devia de ser um directório mas não é</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>Não é possível ler %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros ficheiros foram removidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Foi feito o download de outros ficheiros %1 e %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Fez o download de %1 </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Os ficheiros %1 e %2 foram actualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi actualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronização irá remover todos os ficheiros sincronizados na pasta local '%1'.
Se você ,ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -361,17 +361,17 @@ Are you sure you want to perform this operation?</source>
Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -379,67 +379,67 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Não foi possível repor o estado da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>A aguardar o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>A preparar para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>A sincronização está a correr.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>O servidor não está disponível de momento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi efectuada com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Erro na instalação.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Cancelado pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>A sincronização está em pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronização em pausa)</translation>
</message>
@@ -785,12 +785,12 @@ Itens verificados também serão removidos se evitarem que um diretório seja re
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>O ficheiro '%1'<br/>não pode ser aberto para escrita.<br/><br/>O ficheiro de registo <b>not</b> pode ser guardado!</nobr></translation>
</message>
@@ -1266,6 +1266,11 @@ It is not advisable to use it.</source>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1278,7 +1283,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1286,12 +1291,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar a directoria %1</translation>
</message>
@@ -1299,15 +1304,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Não foi possível remover a directoria %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1315,17 +1333,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 44bce73..d728918 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Não é possível criar csync-contexto</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 deveria ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram removidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram baixados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi baixado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 outros arquivos foram atualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado para %2 e %3 outros três arquivos foram renomeados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido para %2 e %3 outros arquivos foram movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronização irá remover todos os arquivos na pasta de sincronização local '%1'.
Se você ou o administrador tiver que redefinir a sua conta no servidor, escolha "Manter arquivos". Se você deseja que seus dados sejam removidos, escolha "Remover todos os arquivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -380,67 +380,67 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Não foi possível redefinir o estado da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Aguardando o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Servidor indisponível no momento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi feita com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Erro de configuração.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Usuário Abortou</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
@@ -786,12 +786,12 @@ Itens marcados também serão excluídos se estiverem impedindo a remoção de u
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Arquivo '%1'<br/>não pode ser aberto para escrita.<br/><br/>A saída de log <b>não</b> pode ser salva!</nobr></translation>
</message>
@@ -1267,6 +1267,11 @@ It is not advisable to use it.</source>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1279,7 +1284,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1287,12 +1292,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<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="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar diretório %1</translation>
</message>
@@ -1300,15 +1305,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>O diretório %1 não pode ser removido</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1316,17 +1334,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 7808d8b..26be273 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Невозможно создать контекст csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальный каталог %1 не существует.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 должен быть каталогом, но не является таковым.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 не читается.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Это действие может удалить все файлы в локальной папке '%1'.
Если вы или ваш администратор заново создали вашу учётную запись на сервере, выберите "Сохранить файлы". Если вы хотите стереть всё - выберите "Удалить все файлы".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -380,67 +380,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Невозможно сбросить состояние папки</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Ожидает, чтобы начать синхронизацию.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Сервер недоступен.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
@@ -786,12 +786,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Файл '%1'<br/>не может быть открыт на запись.<br/><br/>Журнал <b>не может</b> быть сохранён!</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1289,12 +1294,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>не удалось создать директорию %1</translation>
</message>
@@ -1302,15 +1307,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Невозможно удалить директорию %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1318,17 +1336,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 0de192c..d37ac6b 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Nemožno vytvoriť "csync-kontext"</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokálny priečinok %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 by mal byť priečinok, avšak nie je.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 ďalších súborov bolo zmazaných.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol zmazaný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 ďalších súborov bolo stiahnutých.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol stiahnutý.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 a %2 ďalších súborov bolo aktualizovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol aktualizovaný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 bol premenovaný na %2 a %3 ďalších súborov bolo premenovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 bol premenovaný na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 bol presunutý do %2 a %3 ďalších súborov bolo presunutých.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 bol presunutý do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Táto synchronizácia odstráni všetky súbory v lokálnom synchronizačnom priečinku '%1'.
Pokiaľ vy alebo váš správca zresetoval váš účet na serveri, vyberte možnosť "Ponechať súbory". Pokiaľ chcete odstrániť vaše dáta, vyberte možnosť "Odstrániť všetky súbory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -380,67 +380,67 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Nemožno resetovať stav priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Čakanie na štart synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Sever momentálne nie je prístupný.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Posledná synchronizácia sa úspešne skončila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Posledná synchronizácia bola úspešná, ale z varovaniami pre individuálne súbory.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Zrušenie používateľom</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia zapauzovaná)</translation>
</message>
@@ -786,12 +786,12 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Súbor '%1'<br/>nesmie byť otvorený pre proces úprav.</br/><br/>Systémový záznam (log) <b>nemôže</b> byť uložený!</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ Nie je vhodné ju používať.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>nepodarilo sa vytvoriť priečinok %1</translation>
</message>
@@ -1302,15 +1307,28 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Nemožno odstrániť priečinok %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 1997cca..9c1f822 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Ni mogoče ustvariti vsebine csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Krajevna mapa %1 ne obstaja.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 bi morala biti mapa, vendar ni.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 in %2 drugih datotek je odstranjenih.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je odstranjena.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 in %2 drugih datotek je prejetih.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je prejeta.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 in %2 drugih datotek je posodobljenih.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je posodobljena.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>Datoteka %1 je preimenovana v %2. Preimenovanih je bilo še %3 datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Datoteka %1 je preimenovana v %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>Datoteka %1 je premaknjena v %2. Premaknjenih je bilo še %3 datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>Datoteka %1 je premaknjena v %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Z usklajevanjem bodo odstranjene vse krajevne datoteke v mapi '%1'.
Če je bil račun na strežniku kakorkoli ponastavljen, izberite možnost "Ohrani datoteke", če pa želite datoteke res odstraniti, izberite drugo možnost.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -380,67 +380,67 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Ni mogoče ponastaviti stanja mape</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>V čakanju na začetek usklajevanja.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Strežnik trenutno ni na voljo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Zadnje usklajevanje je bilo uspešno končano.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
@@ -786,12 +786,12 @@ Izbrani predmeti bodo tudi izbrisani, v kolikor bi sicer onemogočali brisanje m
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Napaka</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Datoteke '%1'<br/>ni mogoče odpreti za pisanje.<br/><br/>Dnevniškega zapisa <b>ni mogoče</b> shraniti!</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ Uporaba ni priporočljiva.</translation>
<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_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>ni mogoče ustvariti mape %1</translation>
</message>
@@ -1302,15 +1307,28 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>ni mogoče odstraniti mape %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 6f3e30b..fa782ab 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>Kan inte skapa csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Den lokala mappen %1 finns inte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 ska vara en mapp, men är inte det.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 och %2 andra filer har tagits bort.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har tagits bort.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 och %2 andra filer har laddats ner.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har laddats ner.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 och %2 andra filer har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 har döpts om till %2 och %3 andra filer har bytt namn. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har döpts om till %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 har flyttats till %2 och %3 andra filer har tagits bort.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Denna synk skulle radera alla filer i den lokala mappen '%1'.
Om systemadministratören har återställt ditt konto på servern, välj "Behåll filer". Om du vill att dina filer ska raderas, välj "Radera alla filer".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -380,67 +380,67 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Kunde inte återställa mappens skick</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Servern är för tillfället inte tillgänglig.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Senaste synkning lyckades, men det finns varningar för vissa filer!</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
@@ -786,12 +786,12 @@ Valda objekt kommer också att raderas om dom hindrar en mapp från att tas bort
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Filen '%1'<br/>kan inte öppnas för skrivning.<br/><br/>Loggtexten kan <b>inte</b> sparas!</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ Det är inte lämpligt använda den.</translation>
<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öker igen nästa gång.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<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="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>kunde ej skapa katalogen %1</translation>
</message>
@@ -1302,15 +1307,28 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>Kunde ej ta bort mappen %1</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 07afa7b..91dd7bd 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>โฟลเดอร์ในเครื่อง %1 ไม่มีอยู่</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>รอการเริ่มต้นซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -781,12 +781,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>ข้อผิดพลาด</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>ไฟล์ '%1'<br/>ไม่สามารถเปิดขึ้นมาเพื่อเขียนข้อมูลได้.<br/><br/>บันทึกผลลัพธ์ <b>ไม่สามารถ</b> บันทึกข้อมูลได้!</nobr></translation>
</message>
@@ -1262,6 +1262,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1274,7 +1279,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1282,12 +1287,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,15 +1300,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1311,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 1276b7e..ad52ccd 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>csync-context oluşturma başarısız</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 yerel klasörü mevcut değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 bir dizin olmalı, ancak değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya indirildi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 indirildi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ve diğer %2 dosya güncellendi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 güncellendi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1, %2 olarak ve diğer %3 dosya adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1, %2 olarak adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1, %2 konumuna ve diğer %3 dosya taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Bu eşitleme, yerel eşitleme klasörü '%1' içindeki tüm dosyaları kaldıracak.
Eğer siz veya yöneticiniz sunucudaki hesabınızı sıfırlamışsa, "Dosyaları koru" seçin. Eğer verinizin kaldırılmasını istiyorsanız, "Tüm dosyaları kaldır" seçin.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -380,67 +380,67 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>Klasör durumu sıfırılanamadı</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Eşitleme başlatmak için bekleniyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>Sunucu şu an kullanılabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı oldu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Son eşitleme başarılıydı, ancak tekil dosyalarda uyarılar vardı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Kurulum Hatası.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
@@ -786,12 +786,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Hata</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>'%1' dosyası<br/>yazmak üzere açılamadı.<br/><br/>Günlük çıktısı <b>kaydedilemez</b>!</nobr></translation>
</message>
@@ -1269,6 +1269,11 @@ Kullanmanız önerilmez.</translation>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1281,7 +1286,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<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>
@@ -1289,12 +1294,12 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<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="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation>%1 dizini oluşturulamadı</translation>
</message>
@@ -1302,15 +1307,28 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation>%1 dizini kaldırılamadı</translation>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<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>
@@ -1318,17 +1336,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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 Shared olarak geri adlandırın.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<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>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index dac94da..ec9d142 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальна тека %1 не існує.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 повинна бути текою, але нею не є.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>Очікування початку синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>Помилка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -781,12 +781,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>Помилка</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Файл '%1'<br/>не вдається відкрити на запис.<br/><br/>Журнал <b>не</b> можливо зберегти!</nobr></translation>
</message>
@@ -1262,6 +1262,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1274,7 +1279,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1282,12 +1287,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,15 +1300,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1311,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 904d661..929a118 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation>不能生成 csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>本地文件夹 %1 不存在。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 应为目录但并不是。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已移除。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已下载。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 和 %2 个其它文件已更新。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已更新。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已移动至 %2。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>不能重置文件夹状态</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation>服务器当前是不可用的。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation>用户撤销。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -781,12 +781,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>文件 '%1'<br/>不能写入。<br/><br/>将<b>不</b>能保存日志输出！</nobr></translation>
</message>
@@ -1262,6 +1262,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1274,7 +1279,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1282,12 +1287,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,15 +1300,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1311,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index d5dd83e..348466e 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="99"/>
+ <location filename="../src/mirall/folder.cpp" line="107"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="157"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>本地資料夾 %1 不存在</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="160"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>資料夾不存在, %1 必須是資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="163"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="315"/>
+ <location filename="../src/mirall/folder.cpp" line="323"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="409"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="403"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="416"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="447"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="674"/>
+ <location filename="../src/mirall/folder.cpp" line="682"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="677"/>
+ <location filename="../src/mirall/folder.cpp" line="685"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="681"/>
+ <location filename="../src/mirall/folder.cpp" line="689"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="683"/>
+ <location filename="../src/mirall/folder.cpp" line="691"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="684"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -377,67 +377,67 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="173"/>
+ <location filename="../src/mirall/folderman.cpp" line="171"/>
<source>Could not reset folder state</source>
<translation>無法重置資料夾狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="174"/>
+ <location filename="../src/mirall/folderman.cpp" line="172"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="755"/>
+ <location filename="../src/mirall/folderman.cpp" line="753"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="758"/>
+ <location filename="../src/mirall/folderman.cpp" line="756"/>
<source>Waits to start syncing.</source>
<translation>等待啟動同步</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="761"/>
+ <location filename="../src/mirall/folderman.cpp" line="759"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="764"/>
+ <location filename="../src/mirall/folderman.cpp" line="762"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="767"/>
+ <location filename="../src/mirall/folderman.cpp" line="765"/>
<source>Server is currently not available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="770"/>
+ <location filename="../src/mirall/folderman.cpp" line="768"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="775"/>
+ <location filename="../src/mirall/folderman.cpp" line="773"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="778"/>
+ <location filename="../src/mirall/folderman.cpp" line="776"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="781"/>
+ <location filename="../src/mirall/folderman.cpp" line="779"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="784"/>
+ <location filename="../src/mirall/folderman.cpp" line="782"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="790"/>
+ <location filename="../src/mirall/folderman.cpp" line="788"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -781,12 +781,12 @@ Checked items will also be deleted if they prevent a directory from being remove
<context>
<name>Mirall::Logger</name>
<message>
- <location filename="../src/mirall/logger.cpp" line="155"/>
+ <location filename="../src/mirall/logger.cpp" line="146"/>
<source>Error</source>
<translation>錯誤</translation>
</message>
<message>
- <location filename="../src/mirall/logger.cpp" line="156"/>
+ <location filename="../src/mirall/logger.cpp" line="147"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>檔案 '%1'<br/>無法開啟與寫入<br/><br/>記錄 <b>無法</b> 被儲存</nobr></translation>
</message>
@@ -1262,6 +1262,11 @@ It is not advisable to use it.</source>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
@@ -1274,7 +1279,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="157"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="158"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1282,12 +1287,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="107"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="112"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1295,15 +1300,28 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="81"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
<source>Could not remove directory %1</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>Mirall::PropagateLocalRename</name>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
+ <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="139"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1311,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="223"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
<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="225"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
<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="240"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</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