[Pkg-owncloud-commits] [owncloud-client] 31/69: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Fri Nov 7 19:41:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit f563eb1f6323ac426705d822abe7d9ad22ba8434
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Thu Oct 30 01:25:30 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 41 +++++++++++++++++++---------------
translations/mirall_cs.ts | 45 ++++++++++++++++++++-----------------
translations/mirall_de.ts | 49 ++++++++++++++++++++++------------------
translations/mirall_el.ts | 41 +++++++++++++++++++---------------
translations/mirall_en.ts | 37 ++++++++++++++++++-------------
translations/mirall_es.ts | 41 +++++++++++++++++++---------------
translations/mirall_es_AR.ts | 37 ++++++++++++++++++-------------
translations/mirall_et.ts | 41 +++++++++++++++++++---------------
translations/mirall_eu.ts | 39 ++++++++++++++++++--------------
translations/mirall_fa.ts | 37 ++++++++++++++++++-------------
translations/mirall_fi.ts | 39 ++++++++++++++++++--------------
translations/mirall_fr.ts | 53 ++++++++++++++++++++++++--------------------
translations/mirall_gl.ts | 41 +++++++++++++++++++---------------
translations/mirall_hu.ts | 37 ++++++++++++++++++-------------
translations/mirall_it.ts | 41 +++++++++++++++++++---------------
translations/mirall_ja.ts | 41 +++++++++++++++++++---------------
translations/mirall_nl.ts | 41 +++++++++++++++++++---------------
translations/mirall_pl.ts | 41 +++++++++++++++++++---------------
translations/mirall_pt.ts | 41 +++++++++++++++++++---------------
translations/mirall_pt_BR.ts | 41 +++++++++++++++++++---------------
translations/mirall_ru.ts | 41 +++++++++++++++++++---------------
translations/mirall_sk.ts | 41 +++++++++++++++++++---------------
translations/mirall_sl.ts | 41 +++++++++++++++++++---------------
translations/mirall_sv.ts | 41 +++++++++++++++++++---------------
translations/mirall_th.ts | 37 ++++++++++++++++++-------------
translations/mirall_tr.ts | 41 +++++++++++++++++++---------------
translations/mirall_uk.ts | 41 +++++++++++++++++++---------------
translations/mirall_zh_CN.ts | 37 ++++++++++++++++++-------------
translations/mirall_zh_TW.ts | 37 ++++++++++++++++++-------------
29 files changed, 663 insertions(+), 518 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index ae2bc8c..0310307 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -1355,12 +1355,12 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<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/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>No s'ha pogut crear el directori %1</translation>
</message>
@@ -1368,20 +1368,25 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>No s'ha pogut esborrar la carpeta %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>El fitxer s'ha eliminat d'una compartició només de lectura. S'ha restaurat.</translation>
</message>
@@ -1397,17 +1402,17 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Aquesta carpeta no es pot reanomenar. Reanomeneu-la de nou Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>El fitxer s'ha reanomenat però és part d'una compartició només de lectura. El fixter original s'ha restaurat.</translation>
</message>
@@ -1596,27 +1601,27 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Compte</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Activitat</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Xarxa</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 49b0fb3..2ab44d1 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -1355,12 +1355,12 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<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/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>nepodařilo se vytvořit adresář %1</translation>
</message>
@@ -1368,20 +1368,25 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Nepodařilo se odstranit adresář %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Soubor byl odebrán ze sdílení pouze pro čtení. Soubor byl obnoven.</translation>
</message>
@@ -1397,17 +1402,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven.</translation>
</message>
@@ -1552,7 +1557,7 @@ Zkuste je znovu synchronizovat.</numerusform></translation>
<message>
<location filename="../src/mirall/selectivesyncdialog.cpp" line="274"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
- <translation type="unfinished"/>
+ <translation>Neoznačené adresáře budou <b>odstraněny</b> z lokálního souborového systému a nebudou již synchronizovány na tento počítač</translation>
</message>
</context>
<context>
@@ -1599,27 +1604,27 @@ Zkuste je znovu synchronizovat.</numerusform></translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Účet</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Hlavní</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Síť</translation>
</message>
@@ -2007,7 +2012,7 @@ Zkuste je znovu synchronizovat.</numerusform></translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="183"/>
<source>The mounted directory is temporary not available on the server</source>
- <translation type="unfinished"/>
+ <translation>Připojený adresář je na serveru dočasně nedostupný</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="186"/>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 0621534..dceb1c4 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -199,7 +199,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<message>
<location filename="../src/mirall/accountsettings.cpp" line="608"/>
<source>Discovering '%1'</source>
- <translation>Entdecke '%1'</translation>
+ <translation>»%1« wird entdeckt</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="648"/>
@@ -1356,12 +1356,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Achtung, es könnte ein Problem mit der Groß- und Kleinschreibung für %1 auftreten</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
</message>
@@ -1369,20 +1369,25 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Verzeichnis %1 konnte nicht entfernt werden</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1390,7 +1395,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe gelöscht. Die Datei wurde wiederhergestellt.</translation>
</message>
@@ -1398,17 +1403,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Bitte benennen Sie es zurück wie in der Freigabe.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt.</translation>
</message>
@@ -1552,7 +1557,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</numerusform></translation>
<message>
<location filename="../src/mirall/selectivesyncdialog.cpp" line="274"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
- <translation>Nicht markierte Ordner werden von Ihrem lokalen Dateisystem <b>entfernt</b> und werden auch nicht mehr auf diesem Computer synchronisiert</translation>
+ <translation>Nicht markierte Ordner werden von Ihrem lokalen Dateisystem <b>entfernt</b> und werden auch nicht mehr auf diesem Rechner synchronisiert</translation>
</message>
</context>
<context>
@@ -1560,7 +1565,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</numerusform></translation>
<message>
<location filename="../src/mirall/selectivesyncdialog.cpp" line="36"/>
<source>Loading ...</source>
- <translation>Lade …</translation>
+ <translation>Ladevorgang …</translation>
</message>
</context>
<context>
@@ -1599,27 +1604,27 @@ Versuchen Sie diese nochmals zu synchronisieren.</numerusform></translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Nutzerkonto</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Netzwerk</translation>
</message>
@@ -2238,7 +2243,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</numerusform></translation>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="470"/>
<source>Discovering '%1'</source>
- <translation>Entdecke '%1'</translation>
+ <translation>»%1« wird entdeckt</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="474"/>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index c646cf9..ad652e5 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -1356,12 +1356,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Προσοχή, πιθανή διένεξη κεφαλαίων-πεζών γραμάτων με το %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>αδυναμία δημιουργίας καταλόγου %1</translation>
</message>
@@ -1369,20 +1369,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
- <translation>Δεν ήταν δυνατή η αφαίρεση του %1 λόγω διένεξης με το όνομα ενός τοπικού αρχείου</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Αδυναμία αφαίρεσης καταλόγου %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation>Δεν ήταν δυνατή η αφαίρεση του %1 λόγω διένεξης με το όνομα ενός τοπικού αρχείου</translation>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να μετονομαστεί σε %2 λόγω μιας διένεξης με το όνομα ενός τοπικού αρχείου</translation>
</message>
@@ -1390,7 +1395,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Το αρχείο αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση. Το αρχείο επαναφέρθηκε.</translation>
</message>
@@ -1398,17 +1403,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε τον ξανά Κοινόχρηστος.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Το αρχείο μετονομάστηκε αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Το αρχικό αρχείο επαναφέρθηκε.</translation>
</message>
@@ -1599,27 +1604,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Λογαριασμός</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Δραστηριότητα</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Γενικά</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Δίκτυο</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index f867c74..794f370 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -1350,12 +1350,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1363,20 +1363,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"></translation>
</message>
@@ -1384,7 +1389,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"></translation>
</message>
@@ -1392,17 +1397,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"></translation>
</message>
@@ -1594,27 +1599,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index c0febb5..92145ea 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -1355,12 +1355,12 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, posible error de muyuscula/minisculas en %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>No se pudo crear el directorio %1</translation>
</message>
@@ -1368,20 +1368,25 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
- <translation>No se pudo eliminar %1 por causa de un conflicto con el nombre de un archivo local</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>No se pudo eliminar el directorio %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation>No se pudo eliminar %1 por causa de un conflicto con el nombre de un archivo local</translation>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>El archvo fue eliminado de una carpeta compartida en modo de solo lectura. Ha sido recuperado.</translation>
</message>
@@ -1397,17 +1402,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta carpeta no debe ser renombrada. Favor de renombrar a Compartida.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>El archivo fue renombrado, pero es parte de una carpeta compartida en modo de solo lectura. El archivo original ha sido recuperado.</translation>
</message>
@@ -1598,27 +1603,27 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Red</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 6afb8f6..a03ccc7 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -1352,12 +1352,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1365,20 +1365,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1386,7 +1391,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1394,17 +1399,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1593,27 +1598,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Red</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 4f9c884..8301b1f 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -1355,12 +1355,12 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<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/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>ei suuda luua kataloogi %1</translation>
</message>
@@ -1368,20 +1368,25 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Kausta %1 ei saa eemaldada</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Fail oli eemaldatud kirjutamisõiguseta kataloogist. See on nüüd taastatud.</translation>
</message>
@@ -1397,17 +1402,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Kausta ei tohi ümber nimetada. Kausta algne nimi taastati.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Kausta nime ei tohi muuta. Palun pane selle nimeks tagasi Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Fail oli ümber nimetatud, kuid see on osa kirjutamisõiguseta jagamisest. Algne fail taastati.</translation>
</message>
@@ -1596,27 +1601,27 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Toimingud</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Üldine</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Võrk</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index fd42077..6cbe4ca 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -1355,12 +1355,12 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>Ezin izan da %1 karpeta sortu</translation>
</message>
@@ -1368,20 +1368,25 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Ezin izan da %1 karpeta ezabatu</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1389,7 +1394,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1397,17 +1402,17 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Karpeta hau ezin da berrizendatu. Bere jatorrizko izenera berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Karpeta hau ezin da berrizendatu. Mesedez jarri berriz Shared izena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1596,27 +1601,27 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Kontua</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Jarduera</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Orokorra</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Sarea</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 0b04096..4b1922f 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -1348,12 +1348,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1361,20 +1361,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1382,7 +1387,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1390,17 +1395,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1589,27 +1594,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>حساب کاربری</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>قعالیت</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>عمومی</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index b91381d..3f258fd 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -1351,12 +1351,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>kansion %1 luominen epäonnistui</translation>
</message>
@@ -1364,20 +1364,25 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Kansion %1 poistaminen epäonnistui</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1385,7 +1390,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1393,17 +1398,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1592,27 +1597,27 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Tili</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Toimet</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Yleiset</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Verkko</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 71dbcd8..78cf5db 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -75,7 +75,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="159"/>
<source>Modify Account</source>
- <translation>Modifier un compte</translation>
+ <translation>Modifier le compte</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="20"/>
@@ -121,7 +121,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="130"/>
<source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation><b>Note :</b> Certains fichiers, incluant des dossiers montés depuis le réseau ou des dossiers partagés, peuvent avoir des limites différentes.</translation>
+ <translation><b>Note :</b> Certains dossiers, montés depuis le réseau ou partagés, peuvent avoir des limites différentes.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="171"/>
@@ -168,7 +168,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="763"/>
<source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) de %2 d'espace utilisé sur le serveur.</translation>
+ <translation>L'espace disque sur le serveur est utilisé à %3% (%1 sur %2)</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="807"/>
@@ -489,7 +489,7 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<message>
<location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
<source>Syncing all files in your account with</source>
- <translation>Synchroniser tous les fichiers sur votre compte avec </translation>
+ <translation>Tous les fichiers sont synchronisés dans</translation>
</message>
<message>
<location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
@@ -927,7 +927,7 @@ Les items cochés seront également supprimés s'ils empêchent la suppress
<location filename="../src/mirall/networksettings.ui" line="218"/>
<location filename="../src/mirall/networksettings.ui" line="320"/>
<source>KBytes/s</source>
- <translation>KOctets/s</translation>
+ <translation>Ko/s</translation>
</message>
<message>
<location filename="../src/mirall/networksettings.ui" line="227"/>
@@ -1355,12 +1355,12 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Attention, collision possible avec %1 à cause de la casse</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>impossible de créer le répertoire %1</translation>
</message>
@@ -1368,20 +1368,25 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Impossible de supprimer le dossier %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Le fichier a été supprimé d'un partage en lecture seule. Il a été restauré.</translation>
</message>
@@ -1397,17 +1402,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Ce dossier ne doit pas être renommé. Veuillez le nommer Partagé uniquement.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré.</translation>
</message>
@@ -1505,7 +1510,7 @@ Il est déconseillé de l'utiliser.</translation>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="68"/>
<source>Retry Sync</source>
- <translation>Tenter de synchroniser à nouveau</translation>
+ <translation>Relancer la synchronisation</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="72"/>
@@ -1598,27 +1603,27 @@ Essayez de les synchroniser à nouveau.</numerusform></translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Compte</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Activité</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Généraux</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Réseau</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index e1190a9..3a3a19b 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -1355,12 +1355,12 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Atención, posíbel colisión entre maiúsculas e minúsculas con %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>non foi posíbel crear o directorio %1</translation>
</message>
@@ -1368,20 +1368,25 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Non foi posíbel retirar o directorio %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Foi retirado un ficheiro desde unha compartición de só lectura. Foi restaurado.</translation>
</message>
@@ -1397,17 +1402,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Non é posíbel renomear este cartafol. Devólvalle o nome ao compartido.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado.</translation>
</message>
@@ -1596,27 +1601,27 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Actividade</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Xeral</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Rede</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 6739ccc..bfa66b8 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -1348,12 +1348,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1361,20 +1361,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1382,7 +1387,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1390,17 +1395,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1589,27 +1594,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Fiók</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Aktivitás</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Általános</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Hálózat</translation>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 7a29106..a6887c6 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -1354,12 +1354,12 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Attenzione, possibile conflitto relativo all'uso di maiuscole e minuscole con %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>impossibile creare la cartella %1</translation>
</message>
@@ -1367,20 +1367,25 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Impossibile rimuovere la cartella %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1388,7 +1393,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Il file è stato rimosso da una condivisione in sola lettura. È stato ripristinato.</translation>
</message>
@@ -1396,17 +1401,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Questa cartella non può essere rinominata. Il nome originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Questa cartella non può essere rinominata. Ripristina il nome Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato.</translation>
</message>
@@ -1597,27 +1602,27 @@ Prova a sincronizzare nuovamente.</numerusform></translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Account</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Attività</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Generale</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Rete</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 94ebb1d..8fe955f 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -1353,12 +1353,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>注意: %1 で大文字小文字が競合している可能性</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>ディレクトリ %1 を作成できませんでした</translation>
</message>
@@ -1366,20 +1366,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
- <translation>%1 はローカルファイル名が衝突しているため削除できませんでした</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>ディレクトリ %1 を削除できません</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation>%1 はローカルファイル名が衝突しているため削除できませんでした</translation>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません</translation>
</message>
@@ -1387,7 +1392,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>ファイルが読み込み専用の共有から削除されました。ファイルは復元されました。</translation>
</message>
@@ -1395,17 +1400,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダー名は変更できません。元の名前に戻します。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。</translation>
</message>
@@ -1594,27 +1599,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>アカウント</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>ネットワーク</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index bc81459..3dd13a9 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -1355,12 +1355,12 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Let op, mogelijk conflict hoofdlettergevoeligheid met 1%</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>kon map %1 niet maken</translation>
</message>
@@ -1368,20 +1368,25 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Kon map %1 niet verwijderen</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Het bestand is verwijderd van een alleen-lezen share. Het is teruggezet.</translation>
</message>
@@ -1397,17 +1402,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Deze map mag niet worden hernoemd. Verander de naam terug in Gedeeld.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet.</translation>
</message>
@@ -1598,27 +1603,27 @@ Probeer opnieuw te synchroniseren.</numerusform></translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Account</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Netwerk</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index dcdd4bd..4fd6e26 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -1355,12 +1355,12 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Uwaga, możliwa niezgodność związana z wielością liter w %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>nie można utworzyć katalogu %1</translation>
</message>
@@ -1368,20 +1368,25 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Nie mogę usunąć katalogu %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Plik został usunięty z zasobu z prawem tylko do odczytu. Został przywrócony.</translation>
</message>
@@ -1397,17 +1402,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Folder ten nie może być zmieniony. Został zmieniony z powrotem do pierwotnej nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Przywrócono oryginalny plik</translation>
</message>
@@ -1596,27 +1601,27 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Aktywność</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Ogólne</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Sieć</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 6e80656..dde6881 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -1352,12 +1352,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<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/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar a directoria %1</translation>
</message>
@@ -1365,20 +1365,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Não foi possível remover a directoria %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1386,7 +1391,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>O ficheiro havia sido removido de uma partilha apenas de leitura. Ficheiro restaurado. </translation>
</message>
@@ -1394,17 +1399,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. A alterar para nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor renomeie para o seu nome original: Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mas faz parte de uma partilha só de leitura. O ficheiro original foi restaurado.</translation>
</message>
@@ -1595,27 +1600,27 @@ Tente sincronizá-los novamente.</numerusform></translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Actividade</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Rede</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 01b7c49..15c80d9 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -1353,12 +1353,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Atenção, possível caso de sensibilidade de minúscula/maiúscula, choque com 1%</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>Não foi possível criar diretório %1</translation>
</message>
@@ -1366,20 +1366,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>O diretório %1 não pode ser removido</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1387,7 +1392,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>O arquivo foi removido de um compartilhamento somente de leitura. Ele foi restaurado.</translation>
</message>
@@ -1395,17 +1400,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. Ela será renomeado de volta ao seu nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor, nomeie-a de volta para Compartilhada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O arquivo foi renomeado mas faz parte de compartilhamento só de leitura. O arquivo original foi restaurado.</translation>
</message>
@@ -1594,27 +1599,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Rede</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 4b90a63..26da757 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -1355,12 +1355,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Внимание, возможен конфликт чувствительности к регистру с %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>не удалось создать директорию %1</translation>
</message>
@@ -1368,20 +1368,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
- <translation>Файл %1 не может быть удален из-за локальных конфликтов имен</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Невозможно удалить директорию %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation>Файл %1 не может быть удален из-за локальных конфликтов имен</translation>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>Файл %1 не может быть переименован в %2 из-за локальных конфликтов имен</translation>
</message>
@@ -1389,7 +1394,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Файл был удалён из опубликованной папки с правами только для чтения. Файл был восстановлен.</translation>
</message>
@@ -1397,17 +1402,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Этот файл был переименован но является частью опубликованной папки с правами только для чтения. Оригинальный файл был восстановлен.</translation>
</message>
@@ -1596,27 +1601,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Учётная запись</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Действия</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Основные</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Сеть</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 0667906..48c58eb 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -1355,12 +1355,12 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<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/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>nepodarilo sa vytvoriť priečinok %1</translation>
</message>
@@ -1368,20 +1368,25 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Nemožno odstrániť priečinok %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Súbor bol odobratý zo zdieľania len na čítanie. Súbor bol obnovený.</translation>
</message>
@@ -1397,17 +1402,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu meno Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Súbor bol premenovaný, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený.</translation>
</message>
@@ -1596,27 +1601,27 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Účet</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Všeobecné</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Sieť</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 0385866..835cbc7 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -1355,12 +1355,12 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<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/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>ni mogoče ustvariti mape %1</translation>
</message>
@@ -1368,20 +1368,25 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>ni mogoče odstraniti mape %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Datoteka je bila odstranjena iz mesta v souporabi, vendar je uspešno obnovljena.</translation>
</message>
@@ -1397,17 +1402,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Mape ni dovoljeno preimenovati. Preimenujte jo nazaj na privzeto vrednost.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Datoteka je preimenovana, vendar je označena za souporabo le za branje. Obnovljena je izvirna datoteka.</translation>
</message>
@@ -1600,27 +1605,27 @@ Datoteke poskusite uskladiti znova.</numerusform></translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Račun</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Dejavnosti</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Splošno</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Omrežje</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 3eaeb77..d8e157a 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -1355,12 +1355,12 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Observera, eventuell skiftlägeskänslig konflikt med %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>kunde ej skapa katalogen %1</translation>
</message>
@@ -1368,20 +1368,25 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Kunde ej ta bort mappen %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Den här filen har tagits bort från en endast-läsbar delning. Den återställdes.</translation>
</message>
@@ -1397,17 +1402,17 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denna mapp får inte byta namn. Den kommer att döpas om till sitt ursprungliga namn.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Denna mapp får ej döpas om. Vänligen döp den till Delad igen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>En fil döptes om men är en del av en endast-läsbar delning. Original filen återställdes.</translation>
</message>
@@ -1596,27 +1601,27 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Allmänt</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Nätverk</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 65c6caa..fa63ef2 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -1348,12 +1348,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1361,20 +1361,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1382,7 +1387,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1390,17 +1395,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1589,27 +1594,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>ทั่วไป</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 3a6b779..964d3bd 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -1355,12 +1355,12 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Uyarı, %1 ile muhtemel harf duyarlılığı çatışması</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>%1 dizini oluşturulamadı</translation>
</message>
@@ -1368,20 +1368,25 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <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>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>%1 dizini kaldırılamadı</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <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>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<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>
@@ -1389,7 +1394,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Dosya salt okunur bir paylaşımdan kaldırılmıştı. Geri yüklendi.</translation>
</message>
@@ -1397,17 +1402,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Lütfen Shared olarak geri adlandırın.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Dosya adlandırıldı ancak salt okunur paylaşımın bir parçası. Özgün dosya geri yüklendi.</translation>
</message>
@@ -1598,27 +1603,27 @@ Tekrar eşitleyi deneyin.em.</numerusform></translation>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Hesap</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Etkinlik</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Genel</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Ağ</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 6072722..6f67bbf 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -1355,12 +1355,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation>Увага, можливий конфлікт чутливості до реєстру з %1</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation>Не вдалося створити теку %1</translation>
</message>
@@ -1368,20 +1368,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
- <translation>Неможливо видалити %1 через локальний конфлікт імен</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
- <translation>Неможливо видалити теку %1</translation>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
+ <translation>Неможливо видалити %1 через локальний конфлікт імен</translation>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation>%1 не можна перейменувати на %2 через локальний конфлікт імен</translation>
</message>
@@ -1389,7 +1394,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation>Файл видалено з опублікованої теки з правами тільки на перегляд. Файл відновлено.</translation>
</message>
@@ -1397,17 +1402,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Цю теку не можна перейменувати. Буде повернено старе ім'я.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Цю теку не можна перейменувати. Будь ласка, поверніть їй ім'я Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Файл було перейменовано, але він розташований в теці з правами лише на перегляд. Відновлено оригінальний файл. </translation>
</message>
@@ -1596,27 +1601,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>Обліковий запис</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>Активність</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>Загалом</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>Мережа</translation>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 0693ebe..174ee1a 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -1352,12 +1352,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1365,20 +1365,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1386,7 +1391,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1394,17 +1399,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1593,27 +1598,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>账户</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>动态</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>常规</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>网络</translation>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 6793ad9..98ae98e 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -1348,12 +1348,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalMkdir</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
<source>Attention, possible case sensitivity clash with %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
<source>could not create directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1361,20 +1361,25 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateLocalRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
- <source>Could not remove %1 because of a local file name clash</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
+ <source>Error removing '%1': %2; </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
- <source>Could not remove directory %1</source>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
+ <source>Could not remove directory '%1'; </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
+ <source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>Mirall::PropagateLocalRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="257"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="271"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
<translation type="unfinished"/>
</message>
@@ -1382,7 +1387,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRemove</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="138"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="152"/>
<source>The file has been removed from a read only share. It was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1390,17 +1395,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="294"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="308"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="296"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="310"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="311"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="325"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1589,27 +1594,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SettingsDialogMac</name>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="50"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="63"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="54"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
<source>Account</source>
<translation>帳號</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="58"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
<source>Activity</source>
<translation>活動</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="62"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="75"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/mirall/settingsdialogmac.cpp" line="66"/>
+ <location filename="../src/mirall/settingsdialogmac.cpp" line="79"/>
<source>Network</source>
<translation>網路</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