[Pkg-owncloud-commits] [owncloud-client] 72/219: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:11 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 531d586460ddaab884759ec9329bbce3a77b0321
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Fri Sep 5 01:25:28 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 77 +++++++++++++++++++++------------------
translations/mirall_cs.ts | 77 +++++++++++++++++++++------------------
translations/mirall_de.ts | 77 +++++++++++++++++++++------------------
translations/mirall_el.ts | 77 +++++++++++++++++++++------------------
translations/mirall_en.ts | 77 +++++++++++++++++++++------------------
translations/mirall_es.ts | 77 +++++++++++++++++++++------------------
translations/mirall_es_AR.ts | 77 +++++++++++++++++++++------------------
translations/mirall_et.ts | 87 +++++++++++++++++++++++---------------------
translations/mirall_eu.ts | 77 +++++++++++++++++++++------------------
translations/mirall_fa.ts | 77 +++++++++++++++++++++------------------
translations/mirall_fi.ts | 77 +++++++++++++++++++++------------------
translations/mirall_fr.ts | 77 +++++++++++++++++++++------------------
translations/mirall_gl.ts | 77 +++++++++++++++++++++------------------
translations/mirall_hu.ts | 77 +++++++++++++++++++++------------------
translations/mirall_it.ts | 77 +++++++++++++++++++++------------------
translations/mirall_ja.ts | 77 +++++++++++++++++++++------------------
translations/mirall_nl.ts | 77 +++++++++++++++++++++------------------
translations/mirall_pl.ts | 77 +++++++++++++++++++++------------------
translations/mirall_pt.ts | 77 +++++++++++++++++++++------------------
translations/mirall_pt_BR.ts | 77 +++++++++++++++++++++------------------
translations/mirall_ru.ts | 77 +++++++++++++++++++++------------------
translations/mirall_sk.ts | 77 +++++++++++++++++++++------------------
translations/mirall_sl.ts | 77 +++++++++++++++++++++------------------
translations/mirall_sv.ts | 77 +++++++++++++++++++++------------------
translations/mirall_th.ts | 77 +++++++++++++++++++++------------------
translations/mirall_tr.ts | 77 +++++++++++++++++++++------------------
translations/mirall_uk.ts | 77 +++++++++++++++++++++------------------
translations/mirall_zh_CN.ts | 77 +++++++++++++++++++++------------------
translations/mirall_zh_TW.ts | 77 +++++++++++++++++++++------------------
29 files changed, 1194 insertions(+), 1049 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index c501936..e38ce0e 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -369,7 +369,12 @@ Temps restant total %5</translation>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -406,52 +411,52 @@ Esteu segur que voleu executar aquesta operació?</translation>
<translation>S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Espera per començar la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Perparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronització ha estat un èxit, però amb avisos en fitxers individuals.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
@@ -615,22 +620,22 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No s'ha rebut cap E-Tag del servidor, comproveu el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Hem rebut un E-Tag diferent en la represa. Es comprovarà la pròxima vegada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Temps de connexió excedit</translation>
</message>
@@ -1312,7 +1317,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d'un fitxer local!</translation>
</message>
@@ -1427,12 +1432,12 @@ No és aconsellada usar-la.</translation>
<translation>El fitxer local s'ha eliminat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>El fitxer local ha canviat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>El servidor no ha reconegut l'últim fragment. (No hi havia e-Tag)</translation>
</message>
@@ -1982,73 +1987,73 @@ Proveu de sincronitzar-los de nou.</translation>
<translation>L'element no s'ha sincronitzat degut a errors previs: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>La sincronització d'enllaços simbòlics no està implementada.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>El fitxer està a la llista d'ignorats.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>No es pot obrir el diari de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>No es permet perquè no teniu permisos per afegir una carpeta inferior</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>No es permet l'eliminació, es restaura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>No es permet moure'l, l'element es restaura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>No es permet moure perquè %1 només és de lectura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>el destí</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>l'origen</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 453ea91..480edaa 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -369,7 +369,12 @@ Celkový zbývající čas %5</translation>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -406,52 +411,52 @@ Opravdu chcete provést tuto akci?</translation>
<translation>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Vyčkává na spuštění synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
@@ -615,22 +620,22 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Server odpověděl chybným rozsahem obsahu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Vypršel čas spojení</translation>
</message>
@@ -1312,7 +1317,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation>
</message>
@@ -1427,12 +1432,12 @@ Nedoporučuje se jí používat.</translation>
<translation>Místní soubor byl odstraněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Místní soubor byl změněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
</message>
@@ -1983,73 +1988,73 @@ Zkuste provést novou synchronizaci.
<translation>Položka nebyla synchronizována kvůli předchozí chybě: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Soubor se nachází na seznamu ignorovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Nelze otevřít synchronizační žurnál</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranění není povoleno, obnovuji</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Přesun není povolen, položka obnovena</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Přesun není povolen, protože %1 je pouze pro čtení</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>cílové umístění</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 5d27248..bf870b5 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -370,7 +370,12 @@ Gesamtzeit übrig %5</translation>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -379,17 +384,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -407,52 +412,52 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<translation>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Wartet auf Beginn der Synchronistation</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Setup-Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
@@ -616,22 +621,22 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Server hat falschen Bereich für den Inhalt zurück gegeben</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -1313,7 +1318,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation>
</message>
@@ -1428,12 +1433,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
</message>
@@ -1983,73 +1988,73 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Die Datei ist in der Ignorierliste geführt.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Löschen nicht erlaubt, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>Das Ziel</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>Die Quelle</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 247aaab..c3fcdf1 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -370,7 +370,12 @@ Total time left %5</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -379,17 +384,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -407,52 +412,52 @@ Are you sure you want to perform this operation?</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη Κατάσταση.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Παύση συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμού)</translation>
</message>
@@ -616,22 +621,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Δεν ελήφθη E-Tag από το διακομιστή, ελέγξτε το διακομιστή μεσολάβησης/πύλη</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
</message>
@@ -1313,7 +1318,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
</message>
@@ -1428,12 +1433,12 @@ It is not advisable to use it.</source>
<translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
</message>
@@ -1983,73 +1988,73 @@ It is not advisable to use it.</source>
<translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>ο προορισμός</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>η προέλευση</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 3898db9..5067ca0 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -370,24 +370,29 @@ Total time left %5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -405,52 +410,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
@@ -614,22 +619,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -1307,7 +1312,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
@@ -1422,12 +1427,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
@@ -1974,73 +1979,73 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index f388a81..72830d2 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -369,7 +369,12 @@ Tiempo restante %5</translation>
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -406,52 +411,52 @@ Está seguro de que desea realizar esta operación?</translation>
<translation>Un antiguo registro (journal) de sincronización '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Esperando el inicio de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronización fue exitosa pero con advertencias para archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -615,22 +620,22 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió ninguna e-tag del servidor, revisar el proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>El servidor devolvió un content-range erróneo</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -1312,7 +1317,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El fichero %1 no puede ser descargado debido al nombre de la clase de un fichero local!</translation>
</message>
@@ -1427,12 +1432,12 @@ No se recomienda usarlo.</translation>
<translation>El archivo local fue eliminado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Un archivo local fue modificado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>El servidor no reconoció la última parte. (No había una e-tag presente.)</translation>
</message>
@@ -1982,73 +1987,73 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>El elemento no está sincronizado por errores previos: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Los enlaces simbolicos no estan sopertados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>El fichero está en la lista de ignorados</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>No es posible abrir el diario de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>No está permitido, porque no tiene permisos para añadir subcarpetas en este directorio.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>No está permitido porque no tiene permisos para añadir un directorio</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>No está permitido, porque no tiene permisos para crear archivos en este directorio</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>No está permitido mover, elemento restaurado.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>No está permitido mover, porque %1 es solo lectura.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>origen</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index ebaf028..c6b9859 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -368,7 +368,12 @@ Total time left %5</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -377,17 +382,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -405,52 +410,52 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Esperando el comienzo de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -614,22 +619,22 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1309,7 +1314,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1424,12 +1429,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1977,73 +1982,73 @@ Intente sincronizar estos nuevamente.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Los vínculos simbólicos no está soportados al sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>El archivo está en la lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Imposible inicializar un diario de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index ffcdda2..ca204bf 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -369,7 +369,12 @@ Aega kokku jäänud %5</translation>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -406,52 +411,52 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Ootab sünkroniseerimise alustamist.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
@@ -615,22 +620,22 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Server tagastas vale vahemiku</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -1260,7 +1265,7 @@ Selle kasutamine pole soovitatav.</translation>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="50"/>
<source>Open %1 in Browser</source>
- <translation type="unfinished"/>
+ <translation>Ava %1 veebilehitsejas</translation>
</message>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="77"/>
@@ -1312,7 +1317,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega.</translation>
</message>
@@ -1427,12 +1432,12 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Server ei tunnistanud viimast tükki. (E-silt puudus).</translation>
</message>
@@ -1982,73 +1987,73 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sümboolsed lingid ei ole sünkroniseerimisel toetatud.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Fail on märgitud ignoreeritavate nimistus.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Eemaldamine pole lubatud, taastan</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Liigutamine pole lubatud, üksus taastatud</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>sihtkoht</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>allikas</translation>
</message>
@@ -2212,7 +2217,7 @@ Proovi neid uuesti sünkroniseerida.</translation>
<message utf8="true">
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademark [...]
- <translation type="unfinished"/>
+ <translation><p>Versioon %2. Lisainfot vaata siit <a href="%3">%4</a></p><p><small>autorid on Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz ja teised.<br/>Põhineb Mirall'il, mille autor on Duncan Mac-Vicar P.</small></p><p>Autoriõigus ownCloud, Inc.</p><p>Litsenseeritud GNU General Public License (GPL) Version 2.0.<br/>ownCLoud ja ownCloud logo on [...]
</message>
</context>
<context>
@@ -2239,12 +2244,12 @@ Proovi neid uuesti sünkroniseerida.</translation>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="103"/>
<source>Sync everything from server</source>
- <translation type="unfinished"/>
+ <translation>Sünkroniseeri serverist kõik</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="122"/>
<source>Choose what to sync</source>
- <translation type="unfinished"/>
+ <translation>Vali, mida sünkroniseerida</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="178"/>
@@ -2254,7 +2259,7 @@ Proovi neid uuesti sünkroniseerida.</translation>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="221"/>
<source>&Start a clean sync (Erases the local folder!)</source>
- <translation type="unfinished"/>
+ <translation>Alu&sta puhast sünkroniseerimist (kustutab kohalikud kaustad!)</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="256"/>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 6100fdc..c5af3f2 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -369,7 +369,12 @@ Geratzen den denbora %5</translation>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Izan daiteke karpeta isilpean birkonfiguratu delako edo fitxategi guztiak eskuz
Ziur zaude eragiketa hau egin nahi duzula?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -406,52 +411,52 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation>
<translation>Aurkitu da '%1' sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Erabiltzaileak bertan behera utzi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
@@ -615,22 +620,22 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Konexioa denboraz kanpo</translation>
</message>
@@ -1312,7 +1317,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1427,12 +1432,12 @@ Ez da gomendagarria erabltzea.</translation>
<translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1980,73 +1985,73 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Fitxategia baztertutakoen zerrendan dago.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index a87a1d1..73924c9 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -368,24 +368,29 @@ Total time left %5</source>
<translation>فعالیت همگام سازی</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>نگه داشتن فایل ها</translation>
</message>
@@ -403,52 +408,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>صبر کنید تا همگام سازی آغاز شود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>خارج کردن کاربر.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -612,22 +617,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>تایم اوت اتصال</translation>
</message>
@@ -1305,7 +1310,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1420,12 +1425,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1972,73 +1977,73 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 3839130..479be2e 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -369,24 +369,29 @@ Aikaa jäljellä yhteensä %5</translation>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -404,52 +409,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Odottaa synkronoinnin alkamista.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
@@ -613,22 +618,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -1308,7 +1313,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1423,12 +1428,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1977,73 +1982,73 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Poistaminen ei ole sallittua, palautetaan</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Siirtäminen ei ole sallittua, kohde palautettu</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>kohde</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>lähde</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index b618ad6..120ce56 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -369,7 +369,12 @@ Temps restant total %5</translation>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -406,52 +411,52 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<translation>Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Dernière synchronisation effectuée avec succès</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La dernière synchronisation s'est achevée avec succès mais avec des messages d'avertissement sur des fichiers individuels.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
@@ -615,22 +620,22 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Temps de connexion expiré</translation>
</message>
@@ -1312,7 +1317,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>File %1 ne peut pas être téléchargé en raison d'un conflit sur le nom du fichier local. </translation>
</message>
@@ -1427,12 +1432,12 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Fichier local supprimé pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation>
</message>
@@ -1982,73 +1987,73 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Cet élément n'a pas été synchronisé en raison des erreurs précédentes : %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Les liens symboliques ne sont pas supportés par la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Le fichier est présent dans la liste de fichiers à ignorer.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Le fichier contient des caractères invalides qui ne peuvent être synchronisés entre plate-formes.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Impossible d'ouvrir le journal de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Non autorisé parce-que vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Non autorisé parce-que vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Déplacement non autorisé, élément restauré</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Déplacement non autorisé car %1 est en mode lecture seule</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>la destination</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>la source</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 93d9abc..5f4d093 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -369,7 +369,12 @@ Tempo total restante %5</translation>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -406,52 +411,52 @@ Confirma que quere realizar esta operación?</translation>
<translation>Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Agardando polo comezo da sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
@@ -615,22 +620,22 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>O servidor devolveu un intervalo de contidos estragado</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -1312,7 +1317,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
@@ -1427,12 +1432,12 @@ Recomendámoslle que non o use.</translation>
<translation>O ficheiro local retirarase durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>O ficheiro local cambiou durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presente)</translation>
</message>
@@ -1982,73 +1987,73 @@ Tente sincronizalos de novo.</translation>
<translation>Este elemento non foi sincronizado por mor de erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Non foi posíbel abrir o rexistro de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Non está permitido xa que non ten permiso para engadir un directorio pai</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Non está permitido xa que non ten permiso para engadir ficheiros nese directorio</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Nos está permitido movelo, elemento restaurado</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Bon está permitido movelo xa que %1 é só de lectura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>a orixe</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 5427daa..207b442 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -368,24 +368,29 @@ Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>El legyen távolítva az összes fájl?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -403,52 +408,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Várakozás a szinkronizálás elindítására.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -612,22 +617,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1305,7 +1310,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1420,12 +1425,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1972,73 +1977,73 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index f2a2907..71d6cad 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -369,7 +369,12 @@ Totale tempo rimanente %5</translation>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -406,52 +411,52 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<translation>È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Attende l'inizio della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stato completata correttamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
@@ -615,22 +620,22 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Il server ha restituito un content-range errato</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -1311,7 +1316,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation>
</message>
@@ -1426,12 +1431,12 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Il file locale è stato rimosso durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Un file locale è cambiato durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation>
</message>
@@ -1981,73 +1986,73 @@ Prova a sincronizzare nuovamente.</translation>
<translation>L'elemento non è sincronizzato a causa dell'errore precedente: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Il file è stato aggiunto alla lista ignorati.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Spostamento non consentito, elemento ripristinato</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Spostamento non consentito poiché %1 è in sola lettura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>la destinazione</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>l'origine</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 3f07c8b..a8b8210 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -369,7 +369,12 @@ Total time left %5</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -406,52 +411,52 @@ Are you sure you want to perform this operation?</source>
<translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
@@ -615,22 +620,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>サーバーが間違ったcontent-rangeを返しました</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -1310,7 +1315,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation>
</message>
@@ -1425,12 +1430,12 @@ It is not advisable to use it.</source>
<translation>ローカルファイルを同期時に削除します。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しません。(e-tag が存在しません)</translation>
</message>
@@ -1980,73 +1985,73 @@ It is not advisable to use it.</source>
<translation>このアイテムは、以前にエラーが発生していたため同期させません: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同期の際にシンボリックリンクはサポートしていません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>ファイルは除外リストに登録されています。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>そのディレクトリにサブディレクトリを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>親ディレクトリを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>そのディレクトリにファイルを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>削除できません、復元しています</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>移動できません、項目を復元しました</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 は読み取り専用のため移動できません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>移動先</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>移動元</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 821a520..770f8f1 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -369,7 +369,12 @@ Totaal resterende tijd %5</translation>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Dit kan komen doordat de map ongemerkt opnieuw geconfigureerd is of doordat alle
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -406,52 +411,52 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was succesvol.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
@@ -615,22 +620,22 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Server retourneerde verkeerde content-bandbreedte</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -1312,7 +1317,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden gedownload omdat de naam conflicteert met een lokaal bestand</translation>
</message>
@@ -1427,12 +1432,12 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
</message>
@@ -1982,73 +1987,73 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolic links worden niet ondersteund bij het synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>De file is opgenomen op de negeerlijst.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Niet in staat om een synchornisatie journaal te starten.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync journal niet openen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Verplaatsen niet toegestaan, object hersteld</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Verplaatsen niet toegestaan omdat %1 alleen-lezen is</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>bestemming</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>bron</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 7290d98..0d12909 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -369,7 +369,12 @@ Pozostało czasu %5</translation>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te
Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -406,52 +411,52 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<translation>Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Czekają na uruchomienie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
@@ -615,22 +620,22 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Serwer zwrócił błędną zakres zawartości</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -1312,7 +1317,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation>
</message>
@@ -1427,12 +1432,12 @@ Niezalecane jest jego użycie.</translation>
<translation>Pliki lokalny został usunięty podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation>
</message>
@@ -1982,73 +1987,73 @@ Niezalecane jest jego użycie.</translation>
<translation>Ten element nie jest zsynchronizowane z powodu poprzednich błędów: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linki symboliczne nie są wspierane przy synchronizacji. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Plik jest na liście plików ignorowanych.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nie można zainicjować synchronizacji dziennika.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Nie masz uprawnień do dodawania podkatalogów w tym katalogu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Nie masz uprawnień by dodać katalog nadrzędny</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Nie masz uprawnień by dodać pliki w tym katalogu</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>docelowy</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>źródło</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 0348a13..1e593a3 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -369,7 +369,12 @@ Total time left %5</source>
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -377,17 +382,17 @@ Are you sure you want to perform this operation?</source>
Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -405,52 +410,52 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<translation>Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>A aguardar o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>A preparar para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>A sincronização está a correr.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi efectuada com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Erro na instalação.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Cancelado pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>A sincronização está em pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronização em pausa)</translation>
</message>
@@ -614,22 +619,22 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhum E-Tag recebido do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tentando uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>O servidor retornou o alcance-conteúdo errado</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou </translation>
</message>
@@ -1309,7 +1314,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local!</translation>
</message>
@@ -1424,12 +1429,12 @@ It is not advisable to use it.</source>
<translation>O arquivo local foi removido durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Ficheiro local alterado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation>
</message>
@@ -1980,73 +1985,73 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>O item não está sincronizado devido a erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Hiperligações simbólicas não são suportadas em sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ficheiros a ignorar.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossível inicializar sincronização 'journal'.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Impossível abrir o jornal de sincronismo</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Não permitido, porque não tem permissão para adicionar sub-directórios ao directório</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Não permitido, porque não tem permissão para adicionar o directório principal</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Não permitido, porque não tem permissão para adicionar ficheiros no directório</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Não autorizado para remoção, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Mover não foi permitido, item restaurado</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Mover não foi autorizado porque %1 é só de leitura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>a origem</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 921d0f2..8827a17 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -369,7 +369,12 @@ Total de tempo que falta 5%</translation>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -406,52 +411,52 @@ Você tem certeza que quer executar esta operação?</translation>
<translation>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Aguardando o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi feita com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Erro de Configuração.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Usuário Abortou</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
@@ -615,22 +620,22 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>O servidor retornou erro numa série-de-conteúdo</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
@@ -1310,7 +1315,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser baixado por causa de um confronto local no nome do arquivo!</translation>
</message>
@@ -1425,12 +1430,12 @@ It is not advisable to use it.</source>
<translation>O arquivo local foi removido durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Arquivo local modificado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation>
</message>
@@ -1980,73 +1985,73 @@ Tente sincronizar novamente.</translation>
<translation>O item não está sincronizado devido a erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linques simbólicos não são suportados em sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>O arquivo está listado na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Não é possível abrir o arquivo de sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Não permitido porque você não tem permissão de criar sub-pastas nesta pasta</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Não permitido porque você não tem permissão de criar pastas mãe</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Não permitido porque você não tem permissão de adicionar arquivos a esta pasta</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Não é permitido remover, restaurando</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Não é permitido mover, item restaurado</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Não é permitido mover porque %1 é somente para leitura</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>a fonte</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 213929a..33f69df 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -369,7 +369,12 @@ Total time left %5</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -406,52 +411,52 @@ Are you sure you want to perform this operation?</source>
<translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Ожидает, чтобы начать синхронизацию.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
@@ -615,22 +620,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Сервер вернул неверный диапазон содержания</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Тайм-аут подключения</translation>
</message>
@@ -1312,7 +1317,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Файл %1 не может быть загружен из-за локальных конфликтов имен!</translation>
</message>
@@ -1427,12 +1432,12 @@ It is not advisable to use it.</source>
<translation>Локальный файл был удалён в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Локальный файл изменился в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер не смог подтвердить последний отрезок данных. (Отсутствовали теги e-tag)</translation>
</message>
@@ -1982,73 +1987,73 @@ It is not advisable to use it.</source>
<translation>Путь не синхронизируется из-за произошедших ошибок: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронизация символических ссылок не поддерживается.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не удалось инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Не удаётся открыть журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Недопустимо из-за отсутствия у вас разрешений на добавление подпапок в этой папке</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Недопустимо из-за отсутствия у вас разрешений на добавление родительской папки</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Недопустимо из-за отсутствия у вас разрешений на добавление файлов в эту папку</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Недопустимо отправить этот файл поскольку на севрере он помечен только для чтения, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Недопустимо удалить, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Перемещение недопустимо, элемент восстановлен</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Перемещение недопустимо, поскольку %1 помечен только для чтения</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation> Назначение</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>Источник</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 29516e4..04614e5 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -369,7 +369,12 @@ Celkom zostáva %5</translation>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -406,52 +411,52 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<translation>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Čakanie na štart synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Posledná synchronizácia sa úspešne skončila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Posledná synchronizácia bola úspešná, ale z varovaniami pre individuálne súbory.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Zrušené používateľom.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia je pozastavená)</translation>
</message>
@@ -615,22 +620,22 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Server vrátil nesprávnu hodnotu Content-range</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Spojenie vypršalo</translation>
</message>
@@ -1312,7 +1317,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation>
</message>
@@ -1427,12 +1432,12 @@ Nie je vhodné ju používať.</translation>
<translation>Lokálny súbor bol odstránený počas synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Lokálny súbor bol zmenený počas synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil posledný kúsok. (Nebol prítomný e-tag)</translation>
</message>
@@ -1981,73 +1986,73 @@ Nie je vhodné ju používať.</translation>
<translation>Položka nebola synchronizovaná kvôli predchádzajúcej chybe: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nie sú podporované pri synchronizácii.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Súbor je zapísaný na zozname ignorovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Súbor obsahuje neplatné znaky, ktoré nemôžu byť zosynchronizované medzi platformami.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Nemožno otvoriť sync žurnál</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára podadresáre.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Nie je dovolené, pretože nemáte oprávnenie pridať nadradený adresár.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára súbory.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Nie je dovolené odstrániť. Obnovuje sa.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Presunutie nie je dovolené. Položka obnovená.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>cieľ</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 79a4685..37ec53f 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -368,7 +368,12 @@ Total time left %5</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -377,17 +382,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -405,52 +410,52 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<translation>Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>V čakanju na začetek usklajevanja.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Zadnje usklajevanje je bilo uspešno končano.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
@@ -614,22 +619,22 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Odziv strežnika kaže na neveljaven obseg vsebine</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Povezava časovno pretekla</translation>
</message>
@@ -1311,7 +1316,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation>
</message>
@@ -1426,12 +1431,12 @@ Uporaba ni priporočljiva.</translation>
<translation>Krajevna datoteka je bila me usklajevanjem odstranjena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Strežnik ni prepoznal zadnjega niza besed. (ni določenih e-oznak)</translation>
</message>
@@ -1981,73 +1986,73 @@ Te je treba uskladiti znova.</translation>
<translation>Predmet ni usklajen zaradi predhodne napake: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Usklajevanje simbolnih povezav ni podprto.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Datoteka je na seznamu prezrtih datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>cilj</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>vir</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 8fe8ed0..062db7f 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -369,7 +369,12 @@ Total tid kvar %5</translation>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -406,52 +411,52 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Senaste synkning lyckades, men det finns varningar för vissa filer!</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
@@ -615,22 +620,22 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ingen e-tag mottogs från servern, kontrollera proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -1312,7 +1317,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil!</translation>
</message>
@@ -1427,12 +1432,12 @@ Det är inte lämpligt använda den.</translation>
<translation>Den lokala filen togs bort under synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Servern bekräftade inte det sista fil-fragmentet (Ingen e-tag fanns tillgänglig)</translation>
</message>
@@ -1982,73 +1987,73 @@ Försök att synka dessa igen.</translation>
<translation>Objektet kunde inte synkas på grund av tidigare fel: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symboliska länkar stöds ej i synkningen.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Filen är listad i ignorerings listan.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Filen innehåller ogiltiga tecken som inte kan synkas oberoende av plattform.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Kan inte initialisera en synk journal. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Inte behörig att radera, återställer</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Det gick inte att genomföra flytten, objektet återställs</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Det gick inte att genomföra flytten då %1 är skrivskyddad</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>destinationen</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>källan</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index d44b6d9..ba6ac2a 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -368,24 +368,29 @@ Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -403,52 +408,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>รอการเริ่มต้นซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -612,22 +617,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1305,7 +1310,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1420,12 +1425,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1972,73 +1977,73 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 38cc94f..f56c8de 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -369,7 +369,12 @@ Toplam kalan süre: %5</translation>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -378,17 +383,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -406,52 +411,52 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<translation>Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Eşitleme başlatmak için bekleniyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı oldu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Son eşitleme başarılıydı, ancak tekil dosyalarda uyarılar vardı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Kurulum Hatası.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
@@ -615,22 +620,22 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation>Sunucu yanlış içerik aralığı döndürdü</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>Bağlantı Zaman Aşımı</translation>
</message>
@@ -1312,7 +1317,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor!</translation>
</message>
@@ -1427,12 +1432,12 @@ Kullanmanız önerilmez.</translation>
<translation>Eşitleme sırasında yerel dosya kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>Eşitleme sırasında yerel dosya değişti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
@@ -1982,73 +1987,73 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>Bu öge önceki hatalar koşullarından dolayı eşitlenemiyor: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sembolik bağlantılar eşitlemede desteklenmiyor.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>Bir eşitleme günlüğü başlatılamadı.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>Eşitleme günlüğü açılamıyor</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation>Üst dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation>Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation>Kaldırmaya izin verilmedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation>Taşımaya izin verilmedi, öge geri alındı</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 salt okunur olduğundan taşımaya izin verilmedi</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation>hedef</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation>kaynak</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 16930a6..47fbe32 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -368,7 +368,12 @@ Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -377,17 +382,17 @@ Are you sure you want to perform this operation?</source>
Ви дійсно бажаєте продовжити цю операцію?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>Видалити усі файли?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>Видалити усі файли</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>Зберегти файли</translation>
</message>
@@ -405,52 +410,52 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>Очікування початку синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>Підготовка до синхронізації</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>Помилка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -614,22 +619,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1307,7 +1312,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1422,12 +1427,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1974,73 +1979,73 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 4503fe1..0baf3a1 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -368,7 +368,12 @@ Total time left %5</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -377,17 +382,17 @@ Are you sure you want to perform this operation?</source>
你确定执行该操作吗？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -405,52 +410,52 @@ Are you sure you want to perform this operation?</source>
<translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>上次同步已成功，不过一些文件出现了警告。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>用户撤销。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步已暂停)</translation>
</message>
@@ -614,22 +619,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>未能收到来自服务器的 E-Tag，请检查代理/网关</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>我们收到了不同的恢复 E-Tag，将在下次尝试。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -1309,7 +1314,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1424,12 +1429,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1978,73 +1983,73 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>符号链接不被同步支持。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation>文件在忽略列表中。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation>无法初始化同步日志</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 697d0dc..75cd86e 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -368,24 +368,29 @@ Total time left %5</source>
<translation>同步啟用</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="746"/>
+ <location filename="../src/mirall/folder.cpp" line="604"/>
+ <source>Could not read system exclude file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="763"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="750"/>
+ <location filename="../src/mirall/folder.cpp" line="767"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="752"/>
+ <location filename="../src/mirall/folder.cpp" line="769"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="753"/>
+ <location filename="../src/mirall/folder.cpp" line="770"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
@@ -403,52 +408,52 @@ Are you sure you want to perform this operation?</source>
<translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="807"/>
+ <location filename="../src/mirall/folderman.cpp" line="799"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="810"/>
+ <location filename="../src/mirall/folderman.cpp" line="802"/>
<source>Waits to start syncing.</source>
<translation>等待啟動同步</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="813"/>
+ <location filename="../src/mirall/folderman.cpp" line="805"/>
<source>Preparing for sync.</source>
<translation>正在準備同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="808"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="811"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="824"/>
+ <location filename="../src/mirall/folderman.cpp" line="816"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="827"/>
+ <location filename="../src/mirall/folderman.cpp" line="819"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="830"/>
+ <location filename="../src/mirall/folderman.cpp" line="822"/>
<source>User Abort.</source>
<translation>使用者中斷。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="825"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="831"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步暫停)</translation>
</message>
@@ -612,22 +617,22 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="473"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="475"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="480"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="482"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="507"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="509"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="547"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1305,7 +1310,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="559"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="561"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1420,12 +1425,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="322"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="332"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1972,73 +1977,73 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="303"/>
+ <location filename="../src/mirall/syncengine.cpp" line="354"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="306"/>
+ <location filename="../src/mirall/syncengine.cpp" line="357"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="309"/>
+ <location filename="../src/mirall/syncengine.cpp" line="360"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="485"/>
+ <location filename="../src/mirall/syncengine.cpp" line="536"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="597"/>
+ <location filename="../src/mirall/syncengine.cpp" line="648"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="779"/>
+ <location filename="../src/mirall/syncengine.cpp" line="835"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="786"/>
+ <location filename="../src/mirall/syncengine.cpp" line="842"/>
<source>Not allowed because you don't have permission to add parent directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="793"/>
+ <location filename="../src/mirall/syncengine.cpp" line="849"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="813"/>
+ <location filename="../src/mirall/syncengine.cpp" line="869"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="829"/>
- <location filename="../src/mirall/syncengine.cpp" line="850"/>
+ <location filename="../src/mirall/syncengine.cpp" line="885"/>
+ <location filename="../src/mirall/syncengine.cpp" line="906"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="900"/>
+ <location filename="../src/mirall/syncengine.cpp" line="956"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="909"/>
+ <location filename="../src/mirall/syncengine.cpp" line="965"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="910"/>
+ <location filename="../src/mirall/syncengine.cpp" line="966"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list