[Pkg-owncloud-commits] [owncloud-client] 121/219: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:17 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 580ecbff0c4de9b073766cd8d89ce0158fbf616b
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Thu Sep 18 01:25:28 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 99 ++++++++++++++++----------------
translations/mirall_cs.ts | 99 ++++++++++++++++----------------
translations/mirall_de.ts | 99 ++++++++++++++++----------------
translations/mirall_el.ts | 133 ++++++++++++++++++++++---------------------
translations/mirall_en.ts | 95 ++++++++++++++++---------------
translations/mirall_es.ts | 99 ++++++++++++++++----------------
translations/mirall_es_AR.ts | 99 ++++++++++++++++----------------
translations/mirall_et.ts | 99 ++++++++++++++++----------------
translations/mirall_eu.ts | 99 ++++++++++++++++----------------
translations/mirall_fa.ts | 97 +++++++++++++++----------------
translations/mirall_fi.ts | 99 ++++++++++++++++----------------
translations/mirall_fr.ts | 99 ++++++++++++++++----------------
translations/mirall_gl.ts | 99 ++++++++++++++++----------------
translations/mirall_hu.ts | 97 +++++++++++++++----------------
translations/mirall_it.ts | 101 ++++++++++++++++----------------
translations/mirall_ja.ts | 99 ++++++++++++++++----------------
translations/mirall_nl.ts | 99 ++++++++++++++++----------------
translations/mirall_pl.ts | 99 ++++++++++++++++----------------
translations/mirall_pt.ts | 99 ++++++++++++++++----------------
translations/mirall_pt_BR.ts | 99 ++++++++++++++++----------------
translations/mirall_ru.ts | 99 ++++++++++++++++----------------
translations/mirall_sk.ts | 99 ++++++++++++++++----------------
translations/mirall_sl.ts | 101 ++++++++++++++++----------------
translations/mirall_sv.ts | 99 ++++++++++++++++----------------
translations/mirall_th.ts | 95 ++++++++++++++++---------------
translations/mirall_tr.ts | 99 ++++++++++++++++----------------
translations/mirall_uk.ts | 95 ++++++++++++++++---------------
translations/mirall_zh_CN.ts | 97 +++++++++++++++----------------
translations/mirall_zh_TW.ts | 99 ++++++++++++++++----------------
29 files changed, 1460 insertions(+), 1431 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 272901b..1213bb3 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -289,98 +289,98 @@ Temps restant total %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>No s'ha pogut crear el context-csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>El fitxer local %1 no existeix.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 hauria de ser una carpeta, però no ho és.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 altres fitxers s'han esborrat</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>S'ha esborrat '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 altres fitxers s'han descarregat.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>S'ha descarregat %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 i %2 altres fitxer(s) s'han actualitzat.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>S'ha actualitzat %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 s'ha reanomenat a %2 i %3 altres fitxers s'han reanomenat.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 s'ha reanomenat a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 s'ha reanomenat a %2 i %3 altres fitxers s'han eliminat.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 s'ha mogut a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -407,62 +407,62 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>No es pot restablir l'estat de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Espera per començar la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Perparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
@@ -626,22 +626,22 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Temps de connexió excedit</translation>
</message>
@@ -691,16 +691,16 @@ Esteu segur que voleu executar aquesta operació?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Escriviu contrasenya</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Escriviu %1 contrasenya per s'usuari '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Temps de connexió excedit</translation>
</message>
@@ -1323,7 +1323,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El fitxer s'ha editat localment però és part d'una compartició només de lectura. S'ha restaurat i la vostra edició és en el fitxer en conflicte.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>El fitxer local s'ha eliminat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1536,7 +1537,7 @@ Proveu de sincronitzar-los de nou.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index a07b3b1..5b28813 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -289,98 +289,98 @@ Celkový zbývající čas %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Nepodařilo se vytvořit csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Místní složka %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 by měl být adresář, ale není.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 dalších souborů bylo odebráno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl odebrán.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 dalších souborů bylo staženo.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl stažen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 a %2 dalších souborů bylo aktualizováno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl aktualizován.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 byl přejmenován na %2 a %3 dalších souborů bylo přejmenováno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 byl přejmenován na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 byl přesunut do %2 a %3 dalších souborů bylo přesunuto.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 byl přemístěn do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation>Nezdařilo se přečtení systémového exclude souboru</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -407,62 +407,62 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Nelze obnovit stav složky</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<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="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
@@ -626,22 +626,22 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Vypršel čas spojení</translation>
</message>
@@ -691,16 +691,16 @@ Opravdu chcete provést tuto akci?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Zadejte heslo</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Zadejte prosím %1 heslo pro uživatele '%2': </translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Čas spojení vypršel</translation>
</message>
@@ -1323,7 +1323,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Místní soubor byl odstraněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1537,7 +1538,7 @@ Zkuste provést novou synchronizaci.
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>Pouze označené adresáře se budou synchronizovat na tento počitač</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 6228f2c..566cf55 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -290,98 +290,98 @@ Gesamtzeit übrig %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Kann keinen CSync-Kontext erstellen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokales Verzeichnis %1 existiert nicht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 sollte ein Verzeichnis sein, ist es aber nicht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 und %2 andere Dateien wurden aktualisiert.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde aktualisiert.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 wurde in %2 umbenannt und %3 andere Dateien wurden umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 wurde in %2 umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 wurde in %2 verschoben und %3 andere Dateien wurden verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -390,17 +390,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -408,62 +408,62 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Wartet auf Beginn der Synchronistation</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Setup-Fehler.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
@@ -627,22 +627,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -692,16 +692,16 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Passwort eingeben</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Bitte %1 Passwort für den Nutzer '%2' eingeben:</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1288,7 +1288,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -1324,7 +1324,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1429,22 +1429,23 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1537,7 +1538,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>Nur markierte Ordner werden auf diesen Computer synchronisiert</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 8175199..cf8c734 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -106,7 +106,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="76"/>
<source>Choose What to Sync</source>
- <translation>Επιλέξτε τι θα συγχρονιστεί</translation>
+ <translation>Επιλέξτε Τι θα Συγχρονιστεί</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.ui" line="101"/>
@@ -151,7 +151,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="608"/>
<source>Discovering %1</source>
- <translation>Ανακαλύπτοντας %1</translation>
+ <translation>Ανακαλύψη %1</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="654"/>
@@ -279,7 +279,7 @@ Total time left %5</source>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="138"/>
<source>timeout</source>
- <translation type="unfinished"/>
+ <translation>παρέλευση χρονικού ορίου</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="167"/>
@@ -290,98 +290,98 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Αδυναμία δημιουργίας csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>Ο %1 θα έπρεπε να είναι κατάλογος αρχείων αλλά δεν είναι.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation> Το %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 και άλλα %2 αρχεία αφαιρέθηκαν.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 αφαιρέθηκε.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το αρχείο %1 και άλλα %2 αρχεία έχουν ληφθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ληφθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Το αρχείο %1 και %2 άλλα αρχεία έχουν ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>Το αρχείο %1 έχει μετονομαστεί σε %2 και άλλα %3 αρχεία έχουν μετονομαστεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Το %1 έχει μετονομαστεί σε %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>Το αρχείο %1 έχει μετακινηθεί στο %2 και %3 άλλα αρχεία έχουν μετακινηθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>Το %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
- <translation type="unfinished"/>
+ <translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -390,17 +390,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -408,62 +408,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη Κατάσταση.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Παύση συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμού)</translation>
</message>
@@ -612,7 +612,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="433"/>
<source>Choose What to Sync: You can optionally deselect subfolders you do not wish to synchronize.</source>
- <translation type="unfinished"/>
+ <translation>Επιλέξτε Τι θα Συγχρονιστεί: Μπορείτε προαιρετικά να καταργήστε την επιλογή υποφακέλων που δεν επιθυμείτε να συγχρονίσετε.</translation>
</message>
</context>
<context>
@@ -627,22 +627,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation>Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
</message>
@@ -657,7 +657,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
<source>General Settings</source>
- <translation>Γενικές ρυθμίσεις</translation>
+ <translation>Γενικές Ρυθμίσεις</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -692,16 +692,16 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Εισάγετε Κωδικό Πρόσβασης</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Παρακαλώ εισάγετε τον κωδικό %1 για το χρήστη '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -842,7 +842,7 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
- <translation><p>Μια νέα έκδοση του %1 πελάτη είναι διαθέσιμη.</p><p><b>%2</b> είναι διαθέσιμη για λήψη. Η εγκατεστημένη έκδοση είναι %3.</p></translation>
+ <translation><p>Μια νέα έκδοση του %1 Δέκτη είναι διαθέσιμη.</p><p><b>%2</b> είναι διαθέσιμη για λήψη. Η εγκατεστημένη έκδοση είναι %3.</p></translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -998,7 +998,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
<source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Νέα έκδοση του %1 είναι διαθέσιμη. Παρακαλώ χρησιμοποιήστε το εργαλείο ενημερώσεων του συτήματος για να την εγκαταστήσετε.</translation>
+ <translation>Νέα έκδοση του %1 είναι διαθέσιμη. Παρακαλώ χρησιμοποιήστε το εργαλείο ενημερώσεων του συστήματος για να την εγκαταστήσετε.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1272,7 +1272,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="50"/>
<source>Open %1 in Browser</source>
- <translation type="unfinished"/>
+ <translation>Άνοιγμα %1 στο Πρόγραμμα Περιήγησης</translation>
</message>
<message>
<location filename="../src/wizard/owncloudwizardresultpage.cpp" line="77"/>
@@ -1288,7 +1288,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
</message>
@@ -1324,7 +1324,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
</message>
@@ -1429,22 +1429,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και το επεξεργασμένο βρίσκεται στο αρχείο συγκρούσεων.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
</message>
@@ -1537,9 +1538,9 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
- <translation type="unfinished"/>
+ <translation>Μόνο οι επιλεγμένοι φάκελοι θα συγχρονιστούν σε αυτόν τον υπολογιστή</translation>
</message>
</context>
<context>
@@ -1945,7 +1946,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/syncengine.cpp" line="154"/>
<source>A network connection timeout happened.</source>
- <translation>Διακοπή σύνδεσης δικτύου.</translation>
+ <translation>Διακοπή σύνδεσης δικτύου λόγω παρέλευσης χρονικού ορίου.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
@@ -2078,7 +2079,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/theme.cpp" line="233"/>
<source><p>Version %1 For more information please visit <a href='%2'>%3</a>.</p><p>Copyright ownCloud, Inc.</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p></source>
- <translation><p>Έκδοση %1 Για περισσότερες πληροφορίες, παρακαλώ επισκεφθείτε την ιστοσελίδα <a href='%2'>%3</a>.</p><p>Πνευματική ιδιοκτησία ownCloud, Inc.<p><p>Διανέμεται από %4 και αδειοδοτείται με την GNU General Public License (GPL) Έκδοση 2.0.<br>%5 και το %5 λογότυπο είναι σήμα κατατεθέν του %4 στις Ηνωμένες Πολιτείες, άλλες χώρες ή όλες.</p></translation>
+ <translation><p>Έκδοση %1 Για περισσότερες πληροφορίες, παρακαλώ επισκεφθείτε την ιστοσελίδα <a href='%2'>%3</a>.</p><p>Πνευματική ιδιοκτησία ownCloud, Inc.<p><p>Διανέμεται από %4 και αδειοδοτείται με την GNU General Public License (GPL) Έκδοση 2.0.<br>%5 και το %5 λογότυπο είναι σήμα κατατεθέν του %4 στις Ηνωμένες Πολιτείες, σε άλλες χώρες ή όλες.</p></translation>
</message>
</context>
<context>
@@ -2106,7 +2107,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="277"/>
<source>There are no sync folders configured.</source>
- <translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation>
+ <translation>Δεν έχουν ρυθμιστεί φάκελοι συγχρονισμού.</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="303"/>
@@ -2196,7 +2197,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="467"/>
<source>Discovering %1</source>
- <translation>Ανακαλύπτοντας %1</translation>
+ <translation>Ανακάλυψη %1</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="471"/>
@@ -2224,7 +2225,7 @@ It is not advisable to use it.</source>
<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>Version %2. Για περισσότερες πληροφορίες επισκεφθείτε <a href="%3">%4</a></p><p><small>Των Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz και άλλων.<br/>Βασισμένο στο Mirall του Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Αδειοδότηση υπό την GNU General Public License (GPL) Version 2.0<br/>Το ownCloud και το ownCloud [...]
</message>
</context>
<context>
@@ -2256,7 +2257,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="122"/>
<source>Choose what to sync</source>
- <translation>Επιλογή τι θα συγχρονιστεί</translation>
+ <translation>Επιλέξτε τι θα συγχρονιστεί</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="178"/>
@@ -2266,7 +2267,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="221"/>
<source>&Start a clean sync (Erases the local folder!)</source>
- <translation type="unfinished"/>
+ <translation>&Έναρξη καθαρού συγχρονισμού (Διαγράφει τον τοπικό φάκελο!)</translation>
</message>
<message>
<location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="256"/>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 075dc66..1d25eea 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -290,115 +290,115 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -406,62 +406,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
@@ -625,22 +625,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -690,14 +690,14 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"></translation>
</message>
@@ -1282,7 +1282,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -1318,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="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
@@ -1423,22 +1423,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
@@ -1530,7 +1531,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 8cf7f8b..15b1025 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -289,98 +289,98 @@ Tiempo restante %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Carpeta local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido eliminados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido descargados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 y %2 otros archivos han sido actualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 ha sido renombrado a %2 y %3 otros archivos han sido renombrados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ha sido renombrado a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 ha sido movido a %2 y %3 otros archivos han sido movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -407,62 +407,62 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>No se ha podido restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un antiguo registro (journal) de sincronización '%1' se ha encontrado, pero no se ha podido eliminar. Por favor asegúrese que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Esperando el inicio de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -626,22 +626,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -691,16 +691,16 @@ Está seguro de que desea realizar esta operación?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Introduzca la Contraseña</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Por favor, introduzca su %1 contraseña para el usuario '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -1323,7 +1323,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>El archivo local fue eliminado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1536,7 +1537,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>Solo las carpetas seleccionadas se sincronizarán con esta computadora.</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 56e1e6a..a7cb875 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -288,98 +288,98 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>El directorio local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -388,17 +388,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -406,62 +406,62 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>No se pudo </translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Esperando el comienzo de la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
@@ -625,22 +625,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -690,16 +690,16 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Ingresar contraseña</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Por favor, ingresa %1 contraseña para el usuario '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1284,7 +1284,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1320,7 +1320,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1425,22 +1425,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1533,7 +1534,7 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 3822192..c25c900 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -289,98 +289,98 @@ Aega kokku jäänud %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Ei suuda luua csync-konteksti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Kohalikku kausta %1 pole olemas.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 peaks olema kataloog, kuid pole seda mitte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 teist faili eemaldati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on eemaldatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 teist faili on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ja %2 teist faili on uuendatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on uuendatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 on ümber nimetatud %2 ja %3 muud faili on samuti ümber nimetatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on ümber nimetatud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 on tõstetud %2 ning %3 muud faili on samuti liigutatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -407,62 +407,62 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Ei suutnud tühistada kataloogi staatust</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Ootab sünkroniseerimise alustamist.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
@@ -626,22 +626,22 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation>Server tagastas vale vahemiku</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -691,16 +691,16 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Sisesta parool</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Palun sisesta %1 parool kasutajale '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -1323,7 +1323,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1536,7 +1537,7 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>Selle arvutiga sünkroniseeritakse ainult valitud kaustad.</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index b9a8e83..36eef77 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -289,98 +289,98 @@ Geratzen den denbora %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Ezin da csync-context sortu</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Bertako %1 karpeta ez da existitzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 karpeta bat izan behar zen baina ez da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 eta beste %2 fitxategi ezabatu dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ezabatua izan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 eta beste %2 fitxategi deskargatu dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 deskargatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 eta beste %2 fitxategi kargatu dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 kargatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 %2-(e)ra berrizendatu da eta beste %3 fitxategi berrizendatu dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 %2-(e)ra berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 %2-(e)ra berrizendatu da eta beste %3 fitxategi mugitu dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2-(e)ra mugitu da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -407,62 +407,62 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Ezin izan da karpetaren egoera berrezarri</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>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="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Erabiltzaileak bertan behera utzi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
@@ -626,22 +626,22 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Konexioa denboraz kanpo</translation>
</message>
@@ -691,16 +691,16 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Sartu Pasahitza</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Mesedez sartu %1 pasahitza '%2' erabiltzailerako:</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Konexioa denboraz kanpo</translation>
</message>
@@ -1323,7 +1323,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1428,22 +1428,23 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1536,7 +1537,7 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 6b803ef..e977797 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -288,115 +288,115 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>پوشه محلی %1 موجود نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 باید یک پوشه باشد اما نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 حذف شده است.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 بارگزاری شد.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>فعالیت همگام سازی</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>نگه داشتن فایل ها</translation>
</message>
@@ -404,62 +404,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>صبر کنید تا همگام سازی آغاز شود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>خارج کردن کاربر.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -623,22 +623,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>تایم اوت اتصال</translation>
</message>
@@ -688,14 +688,14 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>رمز را وارد کنید</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1280,7 +1280,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>تایم اوت اتصال</translation>
</message>
@@ -1316,7 +1316,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1421,22 +1421,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1528,7 +1529,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index f55a995..7fa84f0 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -289,115 +289,115 @@ Aikaa jäljellä yhteensä %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Paikallista kansiota %1 ei ole olemassa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 muuta tiedostoa on poistettu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on poistettu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 muuta tiedostoa on ladattu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on ladattu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ja %2 muuta tiedostoa on päivitetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on päivitetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on nimetty uudeelleen muotoon %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -405,62 +405,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Kansion tilaa ei voitu alustaa</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Odottaa synkronoinnin alkamista.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
@@ -624,22 +624,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -689,16 +689,16 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Anna salasana</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Anna käyttäjän '%2' %1-salasana:</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1283,7 +1283,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -1319,7 +1319,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1424,22 +1424,23 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1531,7 +1532,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 21fec8e..03cfed5 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -289,98 +289,98 @@ Temps restant total %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Impossible de créer le contexte csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Le dossier local %1 n'existe pas.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 doit être un répertoire, mais ce n'en ai pas un.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont été supprimés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été supprimé.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont été téléchargés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été téléchargé.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 et %2 autres fichiers ont été mis à jour.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été mis à jour.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 a été renommé en %2 et %3 autres fichiers ont été renommés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 a été renommé en %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 a été déplacé vers %2 et %3 autres fichiers ont été déplacés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a été déplacé vers %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -407,62 +407,62 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Impossible de réinitialiser l'état du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Une synchronisation antérieure du journal de %1 a été trouvée, mais ne peut être supprimée. Veuillez vous assurer qu’aucune application n'est utilisée en ce moment.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<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="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
@@ -626,22 +626,22 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Temps de connexion expiré</translation>
</message>
@@ -691,16 +691,16 @@ Voulez-vous réellement effectuer cette opération ?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Entrez le mot de passe</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Veuillez entrer %1 mot de passe pour l'utilisateur '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Temps de connexion expiré</translation>
</message>
@@ -1323,7 +1323,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Fichier local supprimé pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1536,7 +1537,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 86ad757..b69b5e6 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -289,98 +289,98 @@ Tempo total restante %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Non é posíbel crear o contexto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>O cartafol local %1 non existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 debería ser un directorio e non o é.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron retirados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron descargados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>O ficheiro %1 e outros %2 foron enviados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado satisfactoriamente a %2 e outros %3 tamén foron renomeados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido satisfactoriamente a %2 e outros %3 tamén foron movidos satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -407,62 +407,62 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Non foi posíbel restabelecer o estado do cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Agardando polo comezo da sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
@@ -626,22 +626,22 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -691,16 +691,16 @@ Confirma que quere realizar esta operación?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Escriba o contrasinal</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Escriba o contrasinal %1 para o usuario «%2»:</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -1323,7 +1323,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>O ficheiro local retirarase durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1536,7 +1537,7 @@ Tente sincronizalos de novo.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index fa1a0ec..12c68a3 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -288,115 +288,115 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 helyi mappa nem létezik.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 könyvtár kell legyen, de nem az.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -404,62 +404,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<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="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -623,22 +623,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -688,14 +688,14 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Jelszómegadás</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1280,7 +1280,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1316,7 +1316,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1421,22 +1421,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1528,7 +1529,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index c035f60..778d5a8 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -278,7 +278,7 @@ Totale tempo rimanente %5</translation>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="138"/>
<source>timeout</source>
- <translation type="unfinished"/>
+ <translation>timeout</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="167"/>
@@ -289,98 +289,98 @@ Totale tempo rimanente %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Impossibile creare il contesto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>La cartella locale %1 non esiste.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 dovrebbe essere una cartella.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati rimossi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato rimosso.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati scaricati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato scaricato.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 altri file sono stati aggiornati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato aggiornato.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 è stato rinominato in %2 e %3 altri file sono stati rinominati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 è stato rinominato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 è stato spostato in %2 e %3 altri file sono stati spostati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation>Impossibile leggere il file di esclusione di sistema</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -407,62 +407,62 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Impossibile ripristinare lo stato della cartella</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Attende l'inizio della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stato completata correttamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
@@ -626,22 +626,22 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -691,16 +691,16 @@ Sei sicuro di voler eseguire questa operazione?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Digita la password</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Digita la password di %1 per l'utente '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1286,7 +1286,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -1322,7 +1322,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1427,22 +1427,23 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Il file locale è stato rimosso durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1535,7 +1536,7 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>Saranno sincronizzate con il tuo computer solo le cartelle marcate</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index acbcd7a..4438fb0 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -289,98 +289,98 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>csync-context を作成できません</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 はディレクトリのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 と他 %2 個のファイルが削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 と他 %2 個のファイルがダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 と他 %2 個のファイルが更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 の名前が %2 に変更され、他 %3 個のファイルの名前が変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 が %2 に移され、他 %3 個のファイルが移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation>システム上の除外ファイルを読み込めません</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -407,62 +407,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>フォルダーの状態をリセットできませんでした</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、いくつかのファイルで問題がありました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
@@ -626,22 +626,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation>サーバーが間違ったcontent-rangeを返しました</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -691,16 +691,16 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>パスワードを入力してください</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>ユーザー '%2' の %1 パスワードを入力してください:</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1285,7 +1285,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -1321,7 +1321,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation>
</message>
@@ -1426,22 +1426,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>ローカルファイルを同期時に削除します。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しません。(e-tag が存在しません)</translation>
</message>
@@ -1534,7 +1535,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>マークしたフォルダのみ、このコンピュータに同期されます。</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index e2636a0..4acdd88 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -289,98 +289,98 @@ Totaal resterende tijd %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Onmogelijk om een csync-context te maken</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokale map %1 bestaat niet.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 zou een map moeten zijn, maar is dit niet.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn verwijderd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 is verwijderd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn gedownloaded.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 is gedownloaded.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 en %2 andere bestanden zijn bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 is bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 is hernoemd naar %2 en %3 andere bestanden zijn ook hernoemd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 is hernoemd naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 is verplaatst naar %2 en %3 andere bestanden zijn ook verplaatst.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -407,62 +407,62 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Kan de beginstaat van de map niet terugzetten</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was succesvol.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
@@ -626,22 +626,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation>Server retourneerde verkeerde content-bandbreedte</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -691,16 +691,16 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Vul het wachtwoord in</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Vul het %1 wachtwoord in voor gebruiker '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -1323,7 +1323,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1536,7 +1537,7 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>Alleen geselecteerde mappen worden gesynched naar deze computer</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index b756fb7..1239d03 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -289,98 +289,98 @@ Pozostało czasu %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Nie można utworzyć kontekstu csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Folder lokalny %1 nie istnieje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 powinien być katalogiem, ale nie jest.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 inne pliki zostały usunięte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 został usunięty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 pozostałe pliki zostały ściągnięte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 został ściągnięty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 i %2 inne pliki zostały zaktualizowane.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 został uaktualniony.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 zmienił nazwę na %2 i %3 inne pliki mają zmienione nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 zmienił nazwę na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 został zmieniony na %2 i %3 inne pliku zostały przeniesione.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation>Nie można przeczytać pliku wyłączeń</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -407,62 +407,62 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Nie udało się zresetować stanu folderu</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Czekają na uruchomienie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
@@ -626,22 +626,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -691,16 +691,16 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Wprowadź hasło</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Proszę podać %1 hasło dla użytkownika '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -1323,7 +1323,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Pliki lokalny został usunięty podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1536,7 +1537,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>Tylko zaznaczone foldery będą synchronizowane z tym komputerem</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index fd46e8e..04854d2 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -289,98 +289,98 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Impossível criar 'csync-context'</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 devia de ser um directório mas não é</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>Não é possível ler %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros ficheiros foram removidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Foi feito o download de outros ficheiros %1 e %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Fez o download de %1 </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Os ficheiros %1 e %2 foram actualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi actualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado para %2 e %3 outros ficheiros foram renomeados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido para %2 e %3 outros ficheiros foram movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -388,17 +388,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -406,62 +406,62 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Não foi possível repor o estado da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>A aguardar o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>A preparar para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>A sincronização está a correr.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<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="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Erro na instalação.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Cancelado pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>A sincronização está em pausa.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronização em pausa)</translation>
</message>
@@ -625,22 +625,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou </translation>
</message>
@@ -690,16 +690,16 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Introduza a Palavra-passe</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Por favor introduza %1 password para o utilizador '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1284,7 +1284,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou</translation>
</message>
@@ -1320,7 +1320,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1425,22 +1425,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mas faz parte de uma prtilha só de leitura. Foi restaurado mas a edição está no ficheiro de conflito.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>O arquivo local foi removido durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1533,7 +1534,7 @@ Por favor tente sincronizar novamente.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>Só as pastas verificadas é que serão sincronizadas com este computador</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 77b44ca..278136f 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -289,98 +289,98 @@ Total de tempo que falta 5%</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Não é possível criar csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 deveria ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram removidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram baixados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi baixado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 outros arquivos foram atualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado para %2 e %3 outros três arquivos foram renomeados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido para %2 e %3 outros arquivos foram movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o sistema de arquivo de exclusão</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -407,62 +407,62 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Não foi possível redefinir o estado da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Aguardando o inicio da sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<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="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Erro de Configuração.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Usuário Abortou</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
@@ -626,22 +626,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
@@ -692,16 +692,16 @@ Você tem certeza que quer executar esta operação?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Entrar Senha</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Por favor entrar %1 senha para o usuário '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1285,7 +1285,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
@@ -1321,7 +1321,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1426,22 +1426,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>O arquivo local foi removido durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1534,7 +1535,7 @@ Tente sincronizar novamente.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>Somente pastas verificadas serão sincronizadas com este computador</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 445c663..63858df 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -289,98 +289,98 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Невозможно создать контекст csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальный каталог %1 не существует.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 должен быть каталогом, но не является таковым.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 не читается.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>'%1' и ещё %2 других файлов были удалены.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>'%1' был удалён</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>'%1' и ещё %2 других файлов были загружены.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 был загружен.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 и ещё %2 других файла были обновлены.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 был обновлён.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 был переименован в %2 и ещё %3 других файлов были переименованы.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 был переименован в %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 был перемещён в %2 и ещё %3 других файлов были перемещены.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 был перемещён в %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -407,62 +407,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Невозможно сбросить состояние папки</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Пожалуйста убедитесь что он не открыт в каком-либо приложении.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Ожидает, чтобы начать синхронизацию.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения о нескольких файлах.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
@@ -626,22 +626,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation>Сервер вернул неверный диапазон содержания</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Тайм-аут подключения</translation>
</message>
@@ -691,16 +691,16 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Введите пароль</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Пожалуйста введите пароль от %1 для пользователя '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Тайм-аут подключения</translation>
</message>
@@ -1323,7 +1323,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Файл %1 не может быть загружен из-за локальных конфликтов имен!</translation>
</message>
@@ -1428,22 +1428,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Этот файл был изменен локально, но является частью опубликованной папки с правами только для чтения. Он восстановлен и ваши изменения находятся в файле конфликтов.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Локальный файл был удалён в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation>Локальный файл изменился в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Сервер не смог подтвердить последний отрезок данных. (Отсутствовали теги e-tag)</translation>
</message>
@@ -1536,7 +1537,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 19cb25d..c4219d3 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -289,98 +289,98 @@ Celkom zostáva %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Nemožno vytvoriť "csync-kontext"</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokálny priečinok %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 by mal byť priečinok, avšak nie je.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 ďalších súborov bolo zmazaných.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol zmazaný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 ďalších súborov bolo stiahnutých.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol stiahnutý.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 a %2 ďalších súborov bolo aktualizovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol aktualizovaný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 bol premenovaný na %2 a %3 ďalších súborov bolo premenovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 bol premenovaný na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 bol presunutý do %2 a %3 ďalších súborov bolo presunutých.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 bol presunutý do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -407,62 +407,62 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Nemožno resetovať stav priečinka</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Čakanie na štart synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<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="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Zrušené používateľom.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia je pozastavená)</translation>
</message>
@@ -626,22 +626,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Spojenie vypršalo</translation>
</message>
@@ -691,16 +691,16 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Vložte heslo</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Zadajte prosím %1 heslo pre používateľa '%2': </translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Spojenie vypršalo</translation>
</message>
@@ -1323,7 +1323,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Súbor bol zmenený, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený a upravená verzia je uložená v konfliktnom súbore.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Lokálny súbor bol odstránený počas synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1535,7 +1536,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 70915fd..2983943 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -288,98 +288,98 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Ni mogoče ustvariti vsebine csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Krajevna mapa %1 ne obstaja.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 bi morala biti mapa, vendar ni.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 in %2 drugih datotek je odstranjenih.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je odstranjena.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 in %2 drugih datotek je prejetih.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je prejeta.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 in %2 drugih datotek je posodobljenih.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je posodobljena.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>Datoteka %1 je preimenovana v %2. Preimenovanih je bilo še %3 datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Datoteka %1 je preimenovana v %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>Datoteka %1 je premaknjena v %2. Premaknjenih je bilo še %3 datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>Datoteka %1 je premaknjena v %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -388,17 +388,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -406,62 +406,62 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Ni mogoče ponastaviti stanja mape</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, da datoteka ni v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>V čakanju na začetek usklajevanja.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<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="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
@@ -625,22 +625,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Povezava časovno pretekla</translation>
</message>
@@ -690,16 +690,16 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Vnos gesla</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Vpisati je treba geslo %1 za uporabnika '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1286,7 +1286,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Povezava časovno pretekla</translation>
</message>
@@ -1322,7 +1322,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1427,22 +1427,23 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Datoteka je bila krajevno spremenjena, vendar pa je označena za souporabo le za branje. Izvorna datoteka je obnovljena, vaše spremembe pa so zabeležene v datoteki spora.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Krajevna datoteka je bila me usklajevanjem odstranjena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1535,7 +1536,7 @@ Te je treba uskladiti znova.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
@@ -1825,7 +1826,7 @@ Te je treba uskladiti znova.</translation>
<message>
<location filename="../src/mirall/sslerrordialog.cpp" line="194"/>
<source>Expiration Date: %1</source>
- <translation type="unfinished"/>
+ <translation>Datum preteka: %1</translation>
</message>
<message>
<location filename="../src/mirall/sslerrordialog.cpp" line="198"/>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index c7c8086..0ea929d 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -289,98 +289,98 @@ Total tid kvar %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>Kan inte skapa csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Den lokala mappen %1 finns inte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 ska vara en mapp, men är inte det.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 och %2 andra filer har tagits bort.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har tagits bort.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 och %2 andra filer har laddats ner.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har laddats ner.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 och %2 andra filer har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 har döpts om till %2 och %3 andra filer har bytt namn. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har döpts om till %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 har flyttats till %2 och %3 andra filer har tagits bort.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -407,62 +407,62 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Kunde inte återställa mappens skick</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
@@ -626,22 +626,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -691,16 +691,16 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Ange lösenord</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Vänligen ange %1 lösenord för användare '%2':</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -1323,7 +1323,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Filen ändrades lokalt men är en del av en endast-läsbar delning. Den återställdes och din editering är i konflikt filen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Den lokala filen togs bort under synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1536,7 +1537,7 @@ Försök att synka dessa igen.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index c4b26eb..a14bae9 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -288,115 +288,115 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>โฟลเดอร์ในเครื่อง %1 ไม่มีอยู่</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -404,62 +404,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>รอการเริ่มต้นซิงค์ข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>การซิงค์ข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>การซิงค์ข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>การซิงค์ข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -623,22 +623,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -688,14 +688,14 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1280,7 +1280,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1316,7 +1316,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1421,22 +1421,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1528,7 +1529,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 170dd36..4e065f6 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -289,98 +289,98 @@ Toplam kalan süre: %5</translation>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>csync-context oluşturma başarısız</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 yerel klasörü mevcut değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 bir dizin olmalı, ancak değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya indirildi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 indirildi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ve diğer %2 dosya güncellendi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 güncellendi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1, %2 olarak ve diğer %3 dosya adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1, %2 olarak adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1, %2 konumuna ve diğer %3 dosya taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation>Sistem tarafından okunamayan dosyaları hariç tut</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -389,17 +389,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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -407,62 +407,62 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Klasör durumu sıfırılanamadı</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Eşitleme başlatmak için bekleniyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı oldu.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<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="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Kurulum Hatası.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
@@ -626,22 +626,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<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="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>Bağlantı Zaman Aşımı</translation>
</message>
@@ -691,16 +691,16 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>Parolayı Girin</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>Lütfen '%2' kullanıcısı için %1 parolasını girin:</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,7 +1287,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>Bağlantı Zaman Aşımı</translation>
</message>
@@ -1323,7 +1323,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<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>
@@ -1428,22 +1428,23 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation>Eşitleme sırasında yerel dosya kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<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="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<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>
@@ -1536,7 +1537,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation>Bu bilgisayara sadece seçili klasörler eşitlenecektir</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 6c65544..b339b71 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -288,98 +288,98 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальна тека %1 не існує.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 повинна бути текою, але нею не є.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -388,17 +388,17 @@ Are you sure you want to perform this operation?</source>
Ви дійсно бажаєте продовжити цю операцію?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>Видалити усі файли?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>Видалити усі файли</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>Зберегти файли</translation>
</message>
@@ -406,62 +406,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>Не вдалося скинути стан теки</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>Очікування початку синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>Підготовка до синхронізації</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>Помилка установки.</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
@@ -625,22 +625,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -690,14 +690,14 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1282,7 +1282,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1318,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="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1423,22 +1423,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1530,7 +1531,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 6ba50e6..bc1f752 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -288,98 +288,98 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation>不能生成 csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>本地文件夹 %1 不存在。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 应为目录但并不是。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已移除。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已下载。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 和 %2 个其它文件已更新。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已更新。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已移动至 %2。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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>
@@ -388,17 +388,17 @@ Are you sure you want to perform this operation?</source>
你确定执行该操作吗？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -406,62 +406,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>不能重置文件夹状态</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>上次同步已成功，不过一些文件出现了警告。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>用户撤销。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步已暂停)</translation>
</message>
@@ -625,22 +625,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<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="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -690,14 +690,14 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>输入密码</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
<translation type="unfinished"/>
</message>
@@ -1284,7 +1284,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -1320,7 +1320,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1425,22 +1425,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1532,7 +1533,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index b8b0036..f34b14e 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -288,115 +288,115 @@ Total time left %5</source>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="110"/>
+ <location filename="../src/mirall/folder.cpp" line="111"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="165"/>
<source>Local folder %1 does not exist.</source>
<translation>本地資料夾 %1 不存在</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="167"/>
+ <location filename="../src/mirall/folder.cpp" line="168"/>
<source>%1 should be a directory but is not.</source>
<translation>資料夾不存在, %1 必須是資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="170"/>
+ <location filename="../src/mirall/folder.cpp" line="171"/>
<source>%1 is not readable.</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="336"/>
+ <location filename="../src/mirall/folder.cpp" line="337"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="423"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="436"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="438"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="443"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="445"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="450"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="452"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="460"/>
+ <location filename="../src/mirall/folder.cpp" line="461"/>
<source>Sync Activity</source>
<translation>同步啟用</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="605"/>
+ <location filename="../src/mirall/folder.cpp" line="607"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="777"/>
+ <location filename="../src/mirall/folder.cpp" line="779"/>
<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="781"/>
+ <location filename="../src/mirall/folder.cpp" line="783"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="785"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="784"/>
+ <location filename="../src/mirall/folder.cpp" line="786"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
@@ -404,62 +404,62 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::FolderMan</name>
<message>
- <location filename="../src/mirall/folderman.cpp" line="216"/>
+ <location filename="../src/mirall/folderman.cpp" line="225"/>
<source>Could not reset folder state</source>
<translation>無法重置資料夾狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="217"/>
+ <location filename="../src/mirall/folderman.cpp" line="226"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="816"/>
+ <location filename="../src/mirall/folderman.cpp" line="832"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="819"/>
+ <location filename="../src/mirall/folderman.cpp" line="835"/>
<source>Waits to start syncing.</source>
<translation>等待啟動同步</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="822"/>
+ <location filename="../src/mirall/folderman.cpp" line="838"/>
<source>Preparing for sync.</source>
<translation>正在準備同步。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="825"/>
+ <location filename="../src/mirall/folderman.cpp" line="841"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="828"/>
+ <location filename="../src/mirall/folderman.cpp" line="844"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="833"/>
+ <location filename="../src/mirall/folderman.cpp" line="849"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="836"/>
+ <location filename="../src/mirall/folderman.cpp" line="852"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="839"/>
+ <location filename="../src/mirall/folderman.cpp" line="855"/>
<source>User Abort.</source>
<translation>使用者中斷。</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="842"/>
+ <location filename="../src/mirall/folderman.cpp" line="858"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/mirall/folderman.cpp" line="848"/>
+ <location filename="../src/mirall/folderman.cpp" line="864"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步暫停)</translation>
</message>
@@ -623,22 +623,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="476"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="483"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
<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="510"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="548"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="564"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -688,16 +688,16 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
- <name>Mirall::HttpCredentials</name>
+ <name>Mirall::HttpCredentialsGui</name>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="305"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="370"/>
<source>Enter Password</source>
- <translation>輸入密碼</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/httpcredentials.cpp" line="306"/>
+ <location filename="../src/creds/httpcredentials.cpp" line="371"/>
<source>Please enter %1 password for user '%2':</source>
- <translation>請輸入使用者 %2 的密碼 %1 :</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1280,7 +1280,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PUTFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="91"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="103"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1316,7 +1316,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="562"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="578"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1421,22 +1421,23 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="313"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="326"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="323"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="339"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="333"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="349"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1528,7 +1529,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::SelectiveSyncDialog</name>
<message>
- <location filename="../src/mirall/selectivesyncdialog.cpp" line="270"/>
+ <location filename="../src/mirall/selectivesyncdialog.cpp" line="272"/>
<source>Only checked folders will sync to this computer</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