[Pkg-owncloud-commits] [owncloud-client] 68/171: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Wed Feb 17 09:36:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.
commit 10f1ed771a3ae887734b8a1d1fba5eebfa744168
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Wed Jan 6 02:19:20 2016 -0500
[tx-robot] updated from transifex
---
translations/client_ca.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_cs.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_de.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_el.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_en.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_es.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_es_AR.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_et.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_eu.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_fa.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_fi.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_fr.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_gl.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_hu.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_it.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_ja.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_nb_NO.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_nl.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_pl.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_pt.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_pt_BR.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_ru.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_sk.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_sl.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_sr.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_sv.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_th.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_tr.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_uk.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_zh_CN.ts | 61 ++++++++++++++++++++++++--------------------
translations/client_zh_TW.ts | 61 ++++++++++++++++++++++++--------------------
31 files changed, 1023 insertions(+), 868 deletions(-)
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index a3c9ccf..56d9e0b 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -560,114 +560,114 @@
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>S'ha esborrat '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>S'ha descarregat %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<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/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>S'ha actualitzat %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 s'ha reanomenat a %2 i %3 altres fitxers s'han reanomenat.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 s'ha reanomenat a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 s'ha reanomenat a %2 i %3 altres fitxers s'han eliminat.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 s'ha mogut a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 i altres %2 fitxers no s'han sincronitzat per errors.
Consulteu el registre per obtenir més informació.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no s'ha pogut sincronitzar degut a un error. Mireu el registre per més detalls.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>No s'ha pogut llegir el fitxer d'exclusió del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>S'ha afegit una carpeta nova de més de %1 MB: %2.
Aneu a arranjament per seleccionar-la si voleu descarregar-la.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -1867,12 +1867,12 @@ No és aconsellada usar-la.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>El fitxer ha canviat des de que es va descobrir</translation>
</message>
@@ -1898,12 +1898,17 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Atenció, possible xoc entre majúscules i minúscules amb %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
@@ -1911,17 +1916,17 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Error en eliminar '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>No es pot eliminar %1 perquè hi ha un xoc amb el nom d'un fitxer local</translation>
</message>
@@ -1929,7 +1934,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>El fitxer %1 no es pot reanomenar a %2 perquè hi ha un xoc amb el nom d'un fitxer local</translation>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index a71a43b..b494f79 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -560,96 +560,96 @@
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl odebrán.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl stažen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<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/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl aktualizován.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 byl přemístěn do %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 další soubory nebyly kvůli chybě synchronizovány. Detaily jsou k nalezení v logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nebyl kvůli chybě synchronizován. Detaily jsou k nalezení v logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Nezdařilo se přečtení systémového exclude souboru</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Byl přidán nový adresář %2 větší než %1 MB.
Pokud ho chcete stáhnout, přejděte prosím do nastavení a označte ho.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,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/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -1870,12 +1870,12 @@ Nedoporučuje se jí používat.</translation>
<translation>Soubor nemohl být kompletně stažen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Soubor se mezitím změnil</translation>
</message>
@@ -1901,12 +1901,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Pozor, možná kolize z důvodu velikosti písmen s %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>nepodařilo se vytvořit adresář %1</translation>
</message>
@@ -1914,17 +1919,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Chyba při odstraňování '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Nezdařilo se odstranění adresáře '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Nelze odstranit %1 z důvodu kolize názvu se souborem v místním systému</translation>
</message>
@@ -1932,7 +1937,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu se souborem v místním systému</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 11ffa8c..3f4b873 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -561,95 +561,95 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde gelöscht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 und %2 andere Dateien wurden aktualisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde aktualisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Ein neue Order größer als %1 MB wurde hinzugefügt: %2. Bitte besuchen Sie die Einstellungen, falls sie ihn herunterladen wollen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Die Ursache ist, dass der Ordner entweder neu konfiguriert wurde, oder weil alle
Sind Sie sicher, dass Sie diese Operation durchführen möchten?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -1869,12 +1869,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Datei ist seit der Entdeckung geändert worden</translation>
</message>
@@ -1900,12 +1900,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<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/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>Ordner %1 konnte nicht angelegt werden </translation>
</message>
@@ -1913,17 +1918,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Fehler beim Entfernen '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Der Ordner konnte nicht gelöscht werden '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gelöscht werden</translation>
</message>
@@ -1931,7 +1936,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden</translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index effc129..b0dff86 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -560,96 +560,96 @@
<translation> Το %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 αφαιρέθηκε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ληφθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Το αρχείο %1 και %2 άλλα αρχεία έχουν ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Το %1 έχει μετονομαστεί σε %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>Το %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 και %2 άλλα αρχεία δεν ήταν δυνατό να συγχρονιστούν εξαιτίας σφαλμάτων. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 δεν ήταν δυνατό να συγχρονιστεί εξαιτίας ενός σφάλματος. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Ένας νέος φάκελος μεγαλύτερος από %1 MB έχει προστεθεί: %2.
Παρακαλούμε πηγαίνετε στις ρυθμίσεις για να επιλέξετε αν επιθυμείτε να τον κατεβάσετε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -1871,12 +1871,12 @@ It is not advisable to use it.</source>
<translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
</message>
@@ -1902,12 +1902,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Προσοχή, πιθανή διένεξη κεφαλαίων-πεζών γραμμάτων με το %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>αδυναμία δημιουργίας φακέλου %1</translation>
</message>
@@ -1915,17 +1920,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Σφάλμα κατά την αφαίρεση '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Αδυναμία διαγραφής του φακέλου '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Δεν ήταν δυνατή η αφαίρεση του %1 λόγω διένεξης με το όνομα ενός τοπικού αρχείου</translation>
</message>
@@ -1933,7 +1938,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να μετονομαστεί σε %2 λόγω μιας διένεξης με το όνομα ενός τοπικού αρχείου</translation>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 3fb8926..46b3c03 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -562,112 +562,112 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -1863,12 +1863,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation type="unfinished"></translation>
</message>
@@ -1894,12 +1894,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1907,17 +1912,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"></translation>
</message>
@@ -1925,7 +1930,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index dbfebee..0687e2c 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -560,96 +560,96 @@
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<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/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 y otros %2 archivos no pudieron ser sincronizados debido a errores. Para más detalles, vea el registro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no pudo ser sincronizado debido a un error. Para más detalles, vea el registro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Actividad de la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>No se ha podido leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Se ha añadido una nueva carpeta más grande de %1 MB: %2.
Por favor diríjase a los ajustes para seleccionarlo si desea descargarlo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,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/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -1869,12 +1869,12 @@ No se recomienda usarla.</translation>
<translation>No se ha podido descargar el archivo completamente.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
@@ -1900,12 +1900,17 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, posible error de mayúsculas/minúsculas en %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>No se ha podido crear el directorio %1</translation>
</message>
@@ -1913,17 +1918,17 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Error al borrar '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>No se pudo eliminar la carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>No se ha podido eliminar %1 por causa de un conflicto con el nombre de un archivo local</translation>
</message>
@@ -1931,7 +1936,7 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>El archivo %1 no se puede renombrar a %2 por causa de un conflicto con el nombre de un archivo local</translation>
</message>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index d6f81a3..254a20f 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -560,112 +560,112 @@
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos fueron eliminados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<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/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -1858,12 +1858,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
@@ -1889,12 +1889,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
@@ -1902,17 +1907,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1920,7 +1925,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index 3663b3d..08fb88d 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -560,112 +560,112 @@
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on eemaldatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ja %2 teist faili on uuendatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on uuendatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja veel %2 muu faili sünkroniseerimine ebaõnnestus tõrgete tõttu. Vaata üksikasju.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 sünkroniseerimine ebaõnnestus tõrke tõttu. Lisainfot vaata logist.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -1860,12 +1860,12 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Faili täielik allalaadimine ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Faili on pärast avastamist muudetud</translation>
</message>
@@ -1891,12 +1891,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Tähelepanu, võimalik tõusutundliku nime konflikt %1-ga</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>kausta %1 loomine ebaõnnestus</translation>
</message>
@@ -1904,17 +1909,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Viga eemaldamisel '%1': %2; </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Kausta '%1' eemaldamine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Ei saa eemaldada %1 kuna on konflikt kohaliku faili nimega</translation>
</message>
@@ -1922,7 +1927,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Faili %1 ei saa ümber nimetada %2-ks, kuna on konflikt kohaliku faili nimega</translation>
</message>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index 90b94b6..56177c5 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -560,112 +560,112 @@
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 eta beste %2 fitxategi ezabatu dira.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ezabatua izan da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 eta beste %2 fitxategi deskargatu dira.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 deskargatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 eta beste %2 fitxategi kargatu dira.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 kargatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 %2-(e)ra berrizendatu da eta beste %3 fitxategi berrizendatu dira.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 %2-(e)ra berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 %2-(e)ra berrizendatu da eta beste %3 fitxategi mugitu dira.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2-(e)ra mugitu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 ezin izan da sinkronizatu akats bat dela eta. Ikusi egunerkoa zehaztapen gehiago izateko.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Ezin izan da sistemako baztertutakoen fitxategia irakurri</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -1866,12 +1866,12 @@ Ez da gomendagarria erabltzea.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
@@ -1897,12 +1897,17 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>Ezin da %1 karpeta sortu</translation>
</message>
@@ -1910,17 +1915,17 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1928,7 +1933,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 7bb1af8..6b2a2ea 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -560,112 +560,112 @@
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 حذف شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 بارگزاری شد.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 و %2 فایل دیگر بروز رسانی شدهاند.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 بروز رسانی شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 به %2 تغییر نام داده شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 به %2 انتقال داده شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>فعالیت همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>حذف تمام فایل ها؟</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>حذف تمام فایل ها</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>نگه داشتن فایل ها</translation>
</message>
@@ -1859,12 +1859,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
@@ -1890,12 +1890,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>امکان ایجاد پوشه %1 وجود ندارد</translation>
</message>
@@ -1903,17 +1908,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>خطا در حذف '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1921,7 +1926,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index 3fdb42e..af4838e 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -560,113 +560,113 @@
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 muuta tiedostoa on poistettu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on poistettu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 muuta tiedostoa on ladattu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on ladattu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ja %2 muuta tiedostoa on päivitetty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on päivitetty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>Kohdetta %1 ja %2 muuta tiedostoa ei voi synkronoida virheiden vuoksi. Katso tarkemmat tiedot lokista.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Kohdetta %1 ei voi synkronoida virheen vuoksi. Katso tarkemmat tiedot lokista.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Uusi kansio, joka on suurempi kuin %1 Mt, on lisätty: %2.
Siirry asetuksiin valitaksesi sen, jos haluat ladata kyseisen kansion.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -1867,12 +1867,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Tiedostoa ei voitu ladata täysin.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Tiedosto on muuttunut löytymisen jälkeen</translation>
</message>
@@ -1898,12 +1898,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>kansiota %1 ei voitu luoda</translation>
</message>
@@ -1911,17 +1916,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Virhe poistaessa '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Ei voitu poistaa kansiota '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1929,7 +1934,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 43e850b..7b9115a 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -560,96 +560,96 @@
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été supprimé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<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/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<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/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été mis à jour.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a été déplacé vers %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers n'ont pu être synchronisés pour cause d'erreur. Consultez les logs pour les détails.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 n'a pu être synchronisé pour cause d'erreur. Consultez les logs pour les détails.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Impossible de lire le fichier d'exclusion du système</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2.
Veuillez le sélectionner dans la fenêtre des paramètres pour le télécharger.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Peut-être la configuration a-t-elle été modifiée, ou les fichiers supprimé
Êtes-vous sûr de vouloir effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -1870,12 +1870,12 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Le fichier n'a pas pu être téléchargé intégralement.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Le fichier %1 n'a pas pu être sauvegardé en raison d'un conflit sur le nom du fichier local !</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Le fichier a changé depuis sa découverte</translation>
</message>
@@ -1901,12 +1901,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<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/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>Impossible de créer le dossier %1</translation>
</message>
@@ -1914,17 +1919,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Erreur lors de la suppression de '%1' : %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Impossible de supprimer le répertoire '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Impossible de supprimer %1 à cause d'un conflit local de nom de fichier</translation>
</message>
@@ -1932,7 +1937,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Le fichier %1 ne peut pas être renommé en %2 à cause d'un conflit local de nom de fichier</translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 3a27ded..cd52fc0 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -560,113 +560,113 @@
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<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/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 non puideron sincronizarse por mor de erros. Vexa os detalles no rexistro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 non puido sincronizarse por mor dun erro. Vexa os detalles no rexistro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Non foi posíbel ler o ficheiro de exclusión do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Foi engadido un novo cartafol maior de %1 MB: %2.
Vaia aos axustes e seleccióneo se quere descargalo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -1866,12 +1866,12 @@ Recomendámoslle que non o use.</translation>
<translation>Non foi posíbel descargar completamente o ficheiro.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>O ficheiro cambiou após seren atopado</translation>
</message>
@@ -1897,12 +1897,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<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/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
@@ -1910,17 +1915,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Produciuse un erro ao retirar «%1»: %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Non é posíbel retirar %1 por mor dunha colisión co nome dun ficheiro local</translation>
</message>
@@ -1928,7 +1933,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Non é posíbel renomear o ficheiro %1 como %2 por mor dunha colisión co nome dun ficheiro local</translation>
</message>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index a0647e1..153fffe 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -560,112 +560,112 @@
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 és %2 további fájl törölve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen törölve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 és %2 további fájl letöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen letöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 és %2 további fájl feltöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen feltöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 átnevezve erre: %2 és %3 további fájl átnevezve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 átnevezve erre: %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 áthelyezve ide: %2 és %3 további fájl áthelyezve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 áthelyezve ide: %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 és %2 további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Szinkronizálási aktivitás</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>El legyen távolítva az összes fájl?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -1863,12 +1863,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
@@ -1894,12 +1894,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
@@ -1907,17 +1912,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1925,7 +1930,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 656d551..1c3d6ef 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -560,96 +560,96 @@
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato rimosso.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato scaricato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<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/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato aggiornato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>1% e altri %2 file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 non può essere sincronizzato a causa di un errore. Controlla il log per i dettagli.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Impossibile leggere il file di esclusione di sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2.
Vai nelle impostazioni per selezionarla se desideri scaricarla.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,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/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -1869,12 +1869,12 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Il file non può essere scaricato completamente.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Il file è stato modificato dal suo rilevamento</translation>
</message>
@@ -1900,12 +1900,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<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/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>impossibile creare la cartella %1</translation>
</message>
@@ -1913,17 +1918,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Errore durante la rimozione di '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Impossibile rimuovere la cartella '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Impossibile rimuovere %1 a causa di un conflitto con un file locale</translation>
</message>
@@ -1931,7 +1936,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Il file %1 non può essere rinominato in %2 a causa di un conflitto con il nome di un file locale</translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index bd38da3..92e192e 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -560,96 +560,96 @@
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 と他 %2 個のファイルが更新されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移動しました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>エラーにより、%1 や %2 等のファイルが同期できませんでした。ログで詳細を確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>エラーにより %1 が未同期です。ログで詳細を確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>システム上の除外ファイルを読み込めません</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>新しい %1 MB以上のフォルダーが追加されました: %2
ダウンロードしたい場合は、設定画面で選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -1868,12 +1868,12 @@ It is not advisable to use it.</source>
<translation>このファイルのダウンロードは完了しませんでした</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>%1 はローカルファイル名が衝突しているため保存できません！</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>ファイルは発見以降に変更されました</translation>
</message>
@@ -1899,12 +1899,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>注意: %1 で大文字小文字が競合している可能性</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>フォルダー %1 を作成できませんでした</translation>
</message>
@@ -1912,17 +1917,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>'%1'の削除エラー: %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>フォルダ '%1'を削除できません</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>%1 はローカルファイル名が衝突しているため削除できませんでした</translation>
</message>
@@ -1930,7 +1935,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません</translation>
</message>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 520dbe4..38bca22 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -560,96 +560,96 @@
<translation>%1 kan ikke leses.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 og %2 andre filer har blitt fjernet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt fjernet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 og %2 andre filer har blitt lastet ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt lastet ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 og %2 andre filer har blitt oppdatert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt oppdatert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 har blitt omdøpt til %2 og %3 andre filer har blitt omdøpt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har blitt omdøpt til %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 har blitt flyttet til %2 og %3 andre filer har blitt flyttet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har blitt flyttet til %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 og %2 andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunne ikke synkroniseres pga. en feil. Se loggen for detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Synkroniseringsaktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Klarte ikke å lese systemets ekskluderingsfil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>En ny mappe større enn %1 MB er blitt lagt til: %2.
Gå til Innstillinger og velg mappen hvis du ønsker å laste den ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Dette kan være fordi mappen ble omkonfigurert i det stille, eller alle filene b
Er du sikker på at du vil utføre denne operasjonen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Fjerne alle filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Fjern alle filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Behold filer</translation>
</message>
@@ -1870,12 +1870,12 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Hele filen kunne ikke lastes ned.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Filen er endret siden den ble oppdaget</translation>
</message>
@@ -1901,12 +1901,17 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Merk! mulig sammenfall med %1 pga. sensitivitet for store/små bokstaver</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>klarte ikke å opprette mappe %1</translation>
</message>
@@ -1914,17 +1919,17 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Feil ved fjerning av '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Klarte ikke å fjerne mappe '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Kunne ikke fjerne %1 på grunn av lokalt sammenfall av filnavn</translation>
</message>
@@ -1932,7 +1937,7 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Fil %1 kan ikke omdøpes til %2 på grunn av lokalt sammenfall av filnavn</translation>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 03742a9..7f1e6f8 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -560,96 +560,96 @@
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 is verwijderd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 is gedownloaded.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 en %2 andere bestanden zijn bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 is bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden konden niet worden gesynchroniseerd door fouten. Bekijk het log voor details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kon niet worden gesynchroniseerd door een fout. Bekijk het log voor details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Een nieuwe map groter dan %1 MB is toegevoegd: %2
Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Dat zou kunnen gebeuren omdat de map stilletjes was geherconfigureerd, of omdat
Weet je zeker dat je door wilt gaan?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -1871,12 +1871,12 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Het bestand kon niet volledig worden gedownload.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Het bestand is gewijzigd sinds het is gevonden</translation>
</message>
@@ -1902,12 +1902,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Let op, mogelijk conflict hoofdlettergevoeligheid met 1%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>kon map %1 niet maken</translation>
</message>
@@ -1915,17 +1920,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Fout bij verwijderen '%1": %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Kon map '%1' niet verwijderen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Bestand %1 kon niet worden verwijderd, omdat de naam conflicteert met een lokaal bestand</translation>
</message>
@@ -1933,7 +1938,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand</translation>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index d8c0fd9..f4957f4 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -560,112 +560,112 @@
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 został usunięty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 został ściągnięty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<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/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 został uaktualniony.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 inne pliki nie mogą zostać zsynchronizowane z powodu błędów. Zobacz szczegóły w logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nie może zostać zsynchronizowany z powodu błędu. Zobacz szczegóły w logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Nie można przeczytać pliku wyłączeń</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -1861,12 +1861,12 @@ Niezalecane jest jego użycie.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
@@ -1892,12 +1892,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<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/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
@@ -1905,17 +1910,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Nie można usunąć %1 z powodu kolizji z lokalną nazwą pliku</translation>
</message>
@@ -1923,7 +1928,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Plik %1 nie może być nazwany %2 z powodu kolizji z lokalną nazwą pliku</translation>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index b9c9b7f..87dbb7d 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -560,96 +560,96 @@
<translation>%1 não é legível.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descarregado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 outros ficheiros foram atualizados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado para %2 e %3 outros ficheiros foram renomeados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido para %2 e %3 outros ficheiros foram movidos.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros ficheiros não sincronizaram devido a erros. Verifica o log para mais detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 não sincronizou devido a um erro. Verifica o log para mais detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o ficheiro system exclude</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Foi adicionada uma nova pasta maior do que %1 MB: %2.
Por favor, vá às definições para a selecionar, se a desejar transferir.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Isto poderá acontecer porque a pasta foi reconfigurada silenciosamente, ou todo
Tem a certeza que deseja realizar esta operação?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -1869,12 +1869,12 @@ It is not advisable to use it.</source>
<translation>Não foi possível transferir o ficheiro na totalidade.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>O ficheiro alterou-se desde a sua descoberta</translation>
</message>
@@ -1900,12 +1900,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Atenção, possível sensibilidade a maiúsculas em conflito com %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>Não foi possivel criar a pasta %1</translation>
</message>
@@ -1913,17 +1918,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Erro ao remover '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Nao foi possivel remover %1 devido a conflito local com nome de ficheiro</translation>
</message>
@@ -1931,7 +1936,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>O ficheiro %1 nao pode ser renomeado para %2 devido a conflito com nome de ficheiro local</translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index de7e5e8..eeda88c 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -560,96 +560,96 @@
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi baixado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 outros arquivos foram atualizados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos não puderam ser sincronizados devido a erros. Veja o log para obter detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 não pode ser sincronizado devido a um erro. Veja o log para obter detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o sistema de arquivo de exclusão</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Uma nova pasta maior que %1 MB foi adicionada: %2.
Por favor, vá nas configurações para selecionar o que você deseja para fazer o download.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Isso pode ser porque a pasta foi reconfigurada em silêncio, ou porque todos os
Tem certeza de que deseja executar esta operação?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -1870,12 +1870,12 @@ It is not advisable to use it.</source>
<translation>O arquivo não pode ser baixado completamente.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Arquivo foi alterado desde a descoberta</translation>
</message>
@@ -1901,12 +1901,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<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/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>não foi possível criar a pasta %1</translation>
</message>
@@ -1914,17 +1919,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Erro removendo '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Não foi possível remover a pasta '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Não foi possível remover %1 por causa de um choque de nomes de arquivos locais</translation>
</message>
@@ -1932,7 +1937,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>O arquivo %1 não pode ser renomeado para %2 por causa de um choque com nome de arquivo local</translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 3033a88..3229fd4 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -560,96 +560,96 @@
<translation>%1 не может быть прочитан.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>'%1' был удалён</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 был загружен.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 и ещё %2 других файла были обновлены.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 был обновлён.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 был переименован в %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 был перемещён в %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 и %2 другие файлы не могут быть синхронизированы из-за ошибок. Смотрите детали в журнале.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 не может быть синхронизирован из-за ошибки. Смотрите детали в журнале.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Невозможно прочесть системный файл исключений</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Новый каталог размером более %1 МБ был добавлен: %2.
Пожалуйста, перейдите в настройки, если хотите скачать его.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Are you sure you want to perform this operation?</source>
Вы действительно хотите выполнить эту операцию?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -1869,12 +1869,12 @@ It is not advisable to use it.</source>
<translation>Невозможно полностью загрузить файл.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>После обнаружения файл был изменен</translation>
</message>
@@ -1900,12 +1900,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Внимание, возможен конфликт чувствительности к регистру с %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>не удается создать папку %1</translation>
</message>
@@ -1913,17 +1918,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Ошибка при удалении '%1': %2; </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>Не удается удалить папку '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Не удается удалить %1 из-за локального конфликта имен</translation>
</message>
@@ -1931,7 +1936,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Файл %1 не может быть переименован в %2 из-за локального конфликта имен</translation>
</message>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index 0e9eb29..9020dd7 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -560,96 +560,96 @@
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol zmazaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol stiahnutý.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<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/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol aktualizovaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 bol presunutý do %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 ďalšie súbory nemožno synchronizovať kvôli chybám. Pozrite sa do logu pre podrobnosti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nemôže byť synchronizovaný kvôli chybe. Pozrite sa do logu pre podrobnosti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Nemožno čítať systémový exclude file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Bol pridaný nový priečinok, väčší ako %1 MB: %2.
Pokiaľ si ho prajete stiahnuť, vyberte ho v nastaveniach.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Dôvodom môže byť, že sa daný priečinok potichu rekonfiguroval, alebo boli
Ste si istý, že chcete pokračovať?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -1864,12 +1864,12 @@ Nie je vhodné ju používať.</translation>
<translation>Súbor sa nedá stiahnuť úplne.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Súbor sa medzitým zmenil</translation>
</message>
@@ -1895,12 +1895,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Pozor, možná kolízia z dôvodu veľkosti písmen s %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>nemožno vytvoriť priečinok %1</translation>
</message>
@@ -1908,17 +1913,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Chyba pri odstraňovaní '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Nemožno odstrániť %1 z dôvodu kolízie názvu súboru s lokálnym súborom</translation>
</message>
@@ -1926,7 +1931,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Súbor %1 nemôže byť premenovaný na %2 z dôvodu, že tento názov je už použitý</translation>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index ad68391..6d433c8 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -560,112 +560,112 @@
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je odstranjena.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je prejeta.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Datoteka %1 in še %2 drugih datotek je posodobljenih.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je posodobljena.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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 nekaj datotek (%3).</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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 nekaj datotek (%3).</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>Datoteka %1 je premaknjena v %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 in še %2 drugih datotek ni mogoče uskladiti zaradi napake. Več podrobnosti je zabeleženih v dnevniški datoteki.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Datoteke %1 zaradi napake ni mogoče uskladiti. Več podrobnosti je zabeleženih v dnevniški datoteki.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Ni mogoče prebrati sistemske izločitvene datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -1861,12 +1861,12 @@ Uporaba ni priporočljiva.</translation>
<translation>Datoteke ni mogoče v celoti prejeti.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Datoteka je bila po spremenjena po usklajevanju seznama datotek.</translation>
</message>
@@ -1892,12 +1892,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Pozor, mogoče je neskladje v velikosti črk imena %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
@@ -1905,17 +1910,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Napaka odstranjevanja '%1': %2; </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Ni mogoče odstraniti %1 zaradi neskladja s krajevnim imenom datoteke</translation>
</message>
@@ -1923,7 +1928,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Datoteke %1 ni mogoče preimenovati v %2 zaradi že obstoječe datoteke s tem imenom.</translation>
</message>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index de64bdb..49de1b1 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -560,112 +560,112 @@
<translation>%1 није читљив.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 је уклоњен.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 је преузет.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 и још %2 је ажурирано.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 је ажуриран.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 је преименован у %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 је премештен у %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 и још %2 није могло бити синхронизовано због грешака. Погледајте записник за детаље.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 није синхронизован због грешке. Погледајте записник за детаље.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Активност синхронизације</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Не могу да прочитам системски списак за игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Уклонити све фајлове?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Уклони све фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Остави фајлове</translation>
</message>
@@ -1865,12 +1865,12 @@ It is not advisable to use it.</source>
<translation>Фајл није могао бити преузет у потпуности.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Фајл је измењен у међувремену</translation>
</message>
@@ -1896,12 +1896,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Пажња! Могуће сударање због величине слова са %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
@@ -1909,17 +1914,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Грешка при уклањању %1: %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Не могу да уклоним %1 због сударања са називом локалног фајла</translation>
</message>
@@ -1927,7 +1932,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Фајл %1 се не може преименовати у %2 због сударања са називом локалног фајла</translation>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 33bb2da..4c0da6a 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -560,96 +560,96 @@
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har tagits bort.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har laddats ner.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 och %2 andra filer har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 och %2 andra filer kunde inte synkroniseras på grund av ett fel. Kolla loggen för ytterligare detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunde inte synkroniseras på grund av ett fel. Kolla loggen för ytterligare detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Kunde inte läsa systemets exkluderings-fil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>En ny mapp större än %1 MB har lagts till: %2.
Var god gå in i inställningarna för att markera mappen om du vill ladda ner den.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Detta kan bero på att mappen omkonfigurerats i bakgrunden, eller för att alla
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -1867,12 +1867,12 @@ Det är inte lämpligt använda den.</translation>
<translation>Filen kunde inte laddas ner fullständigt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
@@ -1898,12 +1898,17 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Observera, eventuell skiftlägeskänslig konflikt med %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
@@ -1911,17 +1916,17 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Det gick inte att ta bort %1 på grund av ett lokalt filnamn</translation>
</message>
@@ -1929,7 +1934,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Filen %1 kan inte döpas om till %2 på grund av ett lokalt filnamn</translation>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 7958b9b..1e084a0 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -560,96 +560,96 @@
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกลบออก</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกดาวน์โหลด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 และ %2 ไฟล์อื่นๆ ได้ถูกอัพเดทเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกอัพเดทเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ได้ถูกเปลี่ยนชื่อเป็น %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ได้ถูกย้ายไปยัง %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 และ %2 ไฟล์อื่นๆ ไม่สามารถประสานข้อมูลเนื่องจากมีข้อผิดพลาด ดูบันทึกสำหรับรายละเอียด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 ไม่สามารถประสานข้อมูลเนื่องจากมีข้อผิดพลาด ดูบันทึกสำหรับรายละเอียด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>ความเคลื่อนไหวของการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>โฟลเดอร์ใหม่มีขนาดใหญ่กว่า %1 เมกะไบต์ ได้ถูกเพิ่ม: %2
กรุณาไปตั้งค่าถ้าคุณต้องการให้มันดาวน์โหลดได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Are you sure you want to perform this operation?</source>
คุณแน่ใจว่าคุณต้องการที่จะดำเนินการนี้?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>ลบไฟล์ทั้งหมด?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>ลบไฟล์ทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>เก็บไฟล์เอาไว้</translation>
</message>
@@ -1869,12 +1869,12 @@ It is not advisable to use it.</source>
<translation>ไฟล์ไม่สามารถดาวน์โหลดได้อย่างสมบูรณ์</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>ไฟล์ %1 ไม่สามารถบันทึกได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation>
</message>
@@ -1900,12 +1900,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>คำเตือน เคสที่เป็นไปไม่ได้มีผลกับ %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>ไม่สามารถสร้างโฟลเดอร์ %1</translation>
</message>
@@ -1913,17 +1918,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>ข้อผิดพลาดขณะกำลังลบ '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>ไม่สามารถลบโฟลเดอร์ '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>ไม่สามารถลบ %1 เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
</message>
@@ -1931,7 +1936,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>ไฟล์ %1 ไม่สามารถเปลี่ยนชื่อเป็น %2 เพราะชื่อไฟล์ต้นทางตรงกัน!</translation>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index ac36f90..d573c48 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -560,96 +560,96 @@
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 indirildi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<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/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 güncellendi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<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/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya hatalar nedeniyle eşitlenemedi. Ayrıntılar için günlüğe bakın.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 bir hata nedeniyle eşitlenemedi. Ayrıntılar için günlüğe bakın.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>%1 MB boyutundan daha büyük bir yeni klasör eklendi: %2\n
İndirmek istiyorsanız lütfen ayarlar bölümünden seçin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,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/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -1869,12 +1869,12 @@ Kullanmanız önerilmez.</translation>
<translation>Dosya tamamıyla indirilemedi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Dosya, bulunduğundan itibaren değişmiş</translation>
</message>
@@ -1900,12 +1900,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<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/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>%1 klasörü oluşturulamadı</translation>
</message>
@@ -1913,17 +1918,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>'%1' silme hatası: %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>'%1' dizini silinemiyor;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>%1 dosyası yerel bir dosya adı çakışması nedeniyle kaldırılamadı</translation>
</message>
@@ -1931,7 +1936,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Yerel bir dosya adı çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı</translation>
</message>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index cdab604..97b3558 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -560,112 +560,112 @@
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 видалено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 завантажено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 та %2 інших файлів було оновлено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 оновлено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 перейменовано на %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 переміщено в %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 та %2 інші файли не можуть синхронізуватися через помилки. Дивіться деталі в журналі.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 не може синхронізуватися через помилки. Дивіться деталі в журналі.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>Журнал синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>Неможливо прочитати виключений системний файл</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>Видалити усі файли?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>Видалити усі файли</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>Зберегти файли</translation>
</message>
@@ -1860,12 +1860,12 @@ It is not advisable to use it.</source>
<translation>Файл не може бути завантажений повністю.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл %1 не збережено, через локальний конфлікт ім'я! </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>Файл змінився з моменту знаходження</translation>
</message>
@@ -1891,12 +1891,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Увага, можливий конфлікт чутливості до реєстру з %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation type="unfinished"/>
</message>
@@ -1904,17 +1909,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>Помилка видалення '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>Неможливо видалити %1 через локальний конфлікт імен</translation>
</message>
@@ -1922,7 +1927,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>%1 не можна перейменувати на %2 через локальний конфлікт імен</translation>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index a84f7fb..60b5383 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -560,112 +560,112 @@
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已移除。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已下载。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 和 %2 个其它文件已更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 已更名为 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已移动至 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 和 %2 个其它文件同步出错。详情请查看日志。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 同步出错。详情请查看日志。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>无法读取系统排除的文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -1859,12 +1859,12 @@ It is not advisable to use it.</source>
<translation>文件无法完整下载。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>由于本地文件名冲突，文件 %1 无法保存。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>自从发现文件以来，它已经被改变了</translation>
</message>
@@ -1890,12 +1890,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>小心！%1 的文件名可能有大小写冲突</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>无法创建文件夹 %1</translation>
</message>
@@ -1903,17 +1908,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>删除'%1'错误：%2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>由于本地文件名冲突，不能删除 %1</translation>
</message>
@@ -1921,7 +1926,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>由于本地文件名冲突，文件 %1 无法更名为 %2</translation>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index f0cdfd5..b87dada 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -560,96 +560,96 @@
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="411"/>
+ <location filename="../src/gui/folder.cpp" line="412"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="514"/>
<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/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被移除。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="521"/>
<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/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="523"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被下載。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="528"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 和 %2 其他的檔案已被更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="530"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="535"/>
<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/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="537"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 已被重新命名為 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="541"/>
+ <location filename="../src/gui/folder.cpp" line="542"/>
<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/gui/folder.cpp" line="543"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已被搬移至 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="548"/>
+ <location filename="../src/gui/folder.cpp" line="549"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 和 %2 的其他檔案因為錯誤無法被同步。請從紀錄檔觀看細節。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="550"/>
+ <location filename="../src/gui/folder.cpp" line="551"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 因為錯誤無法被同步。請從紀錄檔觀看細節。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="558"/>
+ <location filename="../src/gui/folder.cpp" line="559"/>
<source>Sync Activity</source>
<translation>同步活動</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="890"/>
+ <location filename="../src/gui/folder.cpp" line="891"/>
<source>Could not read system exclude file</source>
<translation>無法讀取系統的排除檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1147"/>
+ <location filename="../src/gui/folder.cpp" line="1148"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>一個大於 %1 MB 的資料夾已經新增至: %2.
如果您想要下載它的話，請至設定中選取。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1160"/>
+ <location filename="../src/gui/folder.cpp" line="1161"/>
<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 files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -658,17 +658,17 @@ Are you sure you want to perform this operation?</source>
您確定要執行這項動作?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1164"/>
+ <location filename="../src/gui/folder.cpp" line="1165"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1166"/>
+ <location filename="../src/gui/folder.cpp" line="1167"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1167"/>
+ <location filename="../src/gui/folder.cpp" line="1168"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
@@ -1867,12 +1867,12 @@ It is not advisable to use it.</source>
<translation>檔案下載無法完成。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="628"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="605"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>檔案 %1 無法存檔，因為本地端的檔案名稱已毀損!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="668"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="645"/>
<source>File has changed since discovery</source>
<translation>尋找的過程中檔案已經被更改</translation>
</message>
@@ -1898,12 +1898,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
+ <source>could not delete file %1, error: %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="160"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
<source>could not create folder %1</source>
<translation>無法建立資料夾 %1</translation>
</message>
@@ -1911,17 +1916,17 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="78"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
<source>Error removing '%1': %2;</source>
<translation>移除時發生錯誤 '%1': %2;</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="104"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
<source>Could not remove folder '%1'</source>
<translation>無法移除資料夾 '%1'</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="122"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
<source>Could not remove %1 because of a local file name clash</source>
<translation>無法刪除 %1 ，因為本地端的檔案名稱已毀損!</translation>
</message>
@@ -1929,7 +1934,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="198"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="212"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>檔案 %1 無法更名成 %2，因為本地端的檔案名稱已毀損</translation>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list