[Pkg-owncloud-commits] [owncloud-client] 39/332: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Aug 14 21:06:35 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 df12a58e3da189d913b3b8eb5d3bcdc0c73ef998
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Wed Jun 4 01:25:24 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 74 ++++++++++++++---------------
translations/mirall_cs.ts | 74 ++++++++++++++---------------
translations/mirall_de.ts | 74 ++++++++++++++---------------
translations/mirall_el.ts | 74 ++++++++++++++---------------
translations/mirall_en.ts | 74 ++++++++++++++---------------
translations/mirall_es.ts | 74 ++++++++++++++---------------
translations/mirall_es_AR.ts | 74 ++++++++++++++---------------
translations/mirall_et.ts | 74 ++++++++++++++---------------
translations/mirall_eu.ts | 74 ++++++++++++++---------------
translations/mirall_fa.ts | 74 ++++++++++++++---------------
translations/mirall_fi.ts | 74 ++++++++++++++---------------
translations/mirall_fr.ts | 74 ++++++++++++++---------------
translations/mirall_gl.ts | 74 ++++++++++++++---------------
translations/mirall_hu.ts | 74 ++++++++++++++---------------
translations/mirall_it.ts | 74 ++++++++++++++---------------
translations/mirall_ja.ts | 108 +++++++++++++++++++++----------------------
translations/mirall_nl.ts | 74 ++++++++++++++---------------
translations/mirall_pl.ts | 78 +++++++++++++++----------------
translations/mirall_pt.ts | 74 ++++++++++++++---------------
translations/mirall_pt_BR.ts | 74 ++++++++++++++---------------
translations/mirall_ru.ts | 74 ++++++++++++++---------------
translations/mirall_sk.ts | 74 ++++++++++++++---------------
translations/mirall_sl.ts | 88 +++++++++++++++++------------------
translations/mirall_sv.ts | 74 ++++++++++++++---------------
translations/mirall_th.ts | 74 ++++++++++++++---------------
translations/mirall_tr.ts | 74 ++++++++++++++---------------
translations/mirall_uk.ts | 74 ++++++++++++++---------------
translations/mirall_zh_CN.ts | 74 ++++++++++++++---------------
translations/mirall_zh_TW.ts | 74 ++++++++++++++---------------
29 files changed, 1099 insertions(+), 1099 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 2e9e8d5..73d61d2 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<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="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Aquesta sincronització eliminarà tots els fitxers a la carpeta local de sincronització '%1'.
Si vós o l'administrador heu reinicialitzat el compte en el servidor, escolliu "Mantenir fitxers". Si voleueliminar les dades, escolliu "Esborra tots els fitxers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -596,17 +596,17 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1278,7 +1278,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1336,17 +1336,17 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Aquesta carpeta no es pot reanomenar. Reanomeneu-la de nou Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1378,12 +1378,12 @@ No és aconsellada usar-la.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1537,12 +1537,12 @@ Proveu de sincronitzar-los de nou.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Error d'accés</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Cal identificar-se com a usuari %1</translation>
</message>
@@ -1925,27 +1925,27 @@ Proveu de sincronitzar-los de nou.</translation>
<translation>L'element no s'ha sincronitzat degut a errors previs: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>La sincronització d'enllaços simbòlics no està implementada.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>El fitxer està a la llista d'ignorats.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>No es pot obrir el diari de sincronització</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 0f4f3db..6aa267d 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<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="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<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="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Tato synchronizace by smazala všechny soubory v místní složce '%1'
Pokud jste vy nebo váš správce zresetovali účet na serveru, zvolte "Ponechat soubory". Pokud chcete místní data odstranit, zvolte "Odstranit všechny soubory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -596,17 +596,17 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Spojení Vypršelo</translation>
</message>
@@ -1278,7 +1278,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1336,17 +1336,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tato složka nemůže být přejmenována. Byl jí vrácen původní název.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tato složka nemůže být přejmenována. Přejmenujte jí prosím zpět na Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven.</translation>
</message>
@@ -1378,12 +1378,12 @@ Nedoporučuje se jí používat.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1538,12 +1538,12 @@ Zkuste provést novou synchronizaci.
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Chyba přihlášení</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Musíte se přihlásit jako uživatel %1</translation>
</message>
@@ -1926,27 +1926,27 @@ Zkuste provést novou synchronizaci.
<translation>Položka nebyla synchronizována kvůli předchozí chybě: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Soubor se nachází na seznamu ignorovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Nelze otevřít synchronizační žurnál</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index cdf6f8f..9ace72a 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -261,100 +261,100 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Kann keinen CSync-Kontext erstellen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokales Verzeichnis %1 existiert nicht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Dieser Synchronisationsvorgang würde alle Dateien in dem lokalen Ordner '%1' entfernen.
Wenn Sie oder Ihr Administrator Ihr Konto auf dem Server zurückgesetzt haben, wählen Sie "Dateien behalten". Wenn Sie ihre Daten löschen wollen, wählen Sie "Alle Dateien entfernen".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -363,17 +363,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -597,17 +597,17 @@ 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="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -1279,7 +1279,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<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>
@@ -1337,17 +1337,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Bitte benennen Sie es zurück wie in der Freigabe.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt.</translation>
</message>
@@ -1379,12 +1379,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<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>
@@ -1538,12 +1538,12 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Log-In Fehler</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Sie müssen sich als %1 einloggen</translation>
</message>
@@ -1926,27 +1926,27 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Die Datei ist in der Ignorierliste geführt.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 53b50cf..e2872d4 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Αδυναμία δημιουργίας πλαισίου csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 επρεπε να ειναι χωρος αποθηκευσης αλλα δεν ειναι.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation> %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει διαγραφεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το αρχείο %1 έχει μεταφορτωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Το αρχείο %1 και %2 άλλα αρχεία έχουν ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το αρχείο %1 έχει ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>Το αρχείο %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Αυτός ο συγχρονισμός θα αφαιρέσει όλα τα αρχεία στον τοπικό φάκελο συγχρονισμού '%1'.
Εάν εσείς ή ο διαχειριστής σας επαναφέρατε τον λογαριασμό σας στο διακομιστή, επιλέξτε "Διατήρηση αρχείων". Εάν θέλετε να αφαιρεθούν τα δεδομένα σας, επιλέξτε "Αφαίρεση όλων των αρχείων".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -596,17 +596,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Χρονικό όριο σύνδεσης</translation>
</message>
@@ -1278,7 +1278,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να μεταφορτωθεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
</message>
@@ -1336,17 +1336,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε το ξανά Κοινόχρηστος.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Το αρχείο μετονομάστηκε αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Το αρχικό αρχείο επαναφέρθηκε.</translation>
</message>
@@ -1378,12 +1378,12 @@ It is not advisable to use it.</source>
<translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και η επεξεργασία σας βρίσκεται στο αρχείο συγκρούσεων.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Ο διακομιστής δεν επιβεβαίωσε το τελευταίο τμήμα. (Δεν υπήρχε E-Tag)</translation>
</message>
@@ -1537,12 +1537,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Σφάλμα σύνδεσης</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Πρέπει να εισέλθετε σαν χρήστης %1</translation>
</message>
@@ -1925,27 +1925,27 @@ It is not advisable to use it.</source>
<translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Αποτυχία ανοίγματος του ημερολογίου συγχρονισμού.</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index c1bd5b6..969c525 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -262,116 +262,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<source>%1 should be a directory but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<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="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -595,17 +595,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -1273,7 +1273,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
@@ -1331,17 +1331,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"></translation>
</message>
@@ -1373,12 +1373,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
@@ -1531,12 +1531,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1917,27 +1917,27 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 33bb7c2..63333a5 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>Carpeta local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<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="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización eliminaría todos los archivos en la carpeta local de sincronización '%1'.
Si ud. o su administrador han restablecido su cuenta en el servidor, elija "Conservar Archivos". Si desea eliminar toda su información, elija "Eliminar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -596,17 +596,17 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -1278,7 +1278,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<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>
@@ -1336,17 +1336,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta carpeta no debe ser renombrada. Favor de renombrar a Compartida.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>El archivo fue renombrado, pero es parte de una carpeta compartida en modo de solo lectura. El archivo original ha sido recuperado.</translation>
</message>
@@ -1378,12 +1378,12 @@ No se recomienda usarlo.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<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>
@@ -1537,12 +1537,12 @@ Intente sincronizar los archivos nuevamente.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Error al iniciar sesión</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Debe iniciar sesión como el usuario %1</translation>
</message>
@@ -1925,27 +1925,27 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>El elemento no está sincronizado por errores previos: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Los enlaces simbolicos no estan sopertados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>El fichero está en la lista de ignorados</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>No es posible abrir el diario de sincronización</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 5041ed4..af1f6e9 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización borraría todos los archivos en la carpeta local de sincronización '%1'.
Si vos o el administrador resetearon tu cuenta en el servidor, elegí "Conservar Archivos". Si querés borrar toda tu información, elegí "Borrar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -596,17 +596,17 @@ 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="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1276,7 +1276,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1334,17 +1334,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1376,12 +1376,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1535,12 +1535,12 @@ Intente sincronizar estos nuevamente.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1921,27 +1921,27 @@ Intente sincronizar estos nuevamente.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Los vínculos simbólicos no está soportados al sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>El archivo está en la lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Imposible inicializar un diario de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 211b568..5de7ff0 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Ei suuda luua csync-konteksti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>Kohalikku kausta %1 pole olemas.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>See sünkroniseering kustutab kõik failid kohalikust kataloogist '%1'.⏎
Kui sina või adminstraator on sinu konto serveris algseadistanud, siis vali "Säilita failid". Kui soovid oma andmed kustutada, vali "Kustuta kõik failid".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -596,17 +596,17 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -1278,7 +1278,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1336,17 +1336,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Kausta ei tohi ümber nimetada. Kausta algne nimi taastati.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Kausta nime ei tohi muuta. Palun pane selle nimeks tagasi Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Fail oli ümber nimetatud, kuid see on osa kirjutamisõiguseta jagamisest. Algne fail taastati.</translation>
</message>
@@ -1378,12 +1378,12 @@ Selle kasutamine pole soovitatav.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1537,12 +1537,12 @@ Proovi neid uuesti sünkroniseerida.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Sisselogimise viga</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Pead sisse logima kui kasutaja %1</translation>
</message>
@@ -1925,27 +1925,27 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sümboolsed lingid ei ole sünkroniseerimisel toetatud.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Fail on märgitud ignoreeritavate nimistus.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index e0c30fa..f78b8d6 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<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="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<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="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1273,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1331,17 +1331,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Karpeta hau ezin da berrizendatu. Bere jatorrizko izenera berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Karpeta hau ezin da berrizendatu. Mesedez jarri berriz Shared izena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1373,12 +1373,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1532,12 +1532,12 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1918,27 +1918,27 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Fitxategia baztertutakoen zerrendan dago.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 74b1ce2..56e52ec 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>پوشه محلی %1 موجود نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 باید یک پوشه باشد اما نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<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="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,7 +1271,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1329,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1371,12 +1371,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1529,12 +1529,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1915,27 +1915,27 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 5075795..80515ab 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<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="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -1273,7 +1273,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1331,17 +1331,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1373,12 +1373,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1531,12 +1531,12 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Kirjautumisvirhe</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Kirjaudu käyttäjänä %1</translation>
</message>
@@ -1919,27 +1919,27 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 0ac1d2e..c44cbad 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<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="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<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="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Cette synchronisation supprimerait tous les fichiers du dossier local de synchronisation '%1'.
Si vous-même ou votre administrateur avez réinitialisé votre compte sur le serveur, choisissez "Garder les fichiers". Si vous voulez que vos données soient supprimées, choisissez "Supprimer tous les fichiers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -596,17 +596,17 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Temps de connexion expiré</translation>
</message>
@@ -1278,7 +1278,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<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>
@@ -1336,17 +1336,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Ce dossier ne doit pas être renommé. Veuillez le nommer Partagé uniquement.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré.</translation>
</message>
@@ -1378,12 +1378,12 @@ Il est déconseillé de l'utiliser.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<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>
@@ -1537,12 +1537,12 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Erreur de connexion</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Vous devez vous connecter en tant qu'utilisateur %1</translation>
</message>
@@ -1925,27 +1925,27 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Cet élément n'a pas été synchronisé en raison des erreurs précédentes : %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Les liens symboliques ne sont pas supportés par la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Le fichier est présent dans la liste de fichiers à ignorer.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Le fichier contient des caractères invalides qui ne peuvent être synchronisés entre plate-formes.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Impossible d'ouvrir le journal de synchronisation</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index eb90681..6dbb5af 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<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="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<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="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización retirará todos os ficheiros do cartafol local de sincronización «%1».
Se vostede, ou o administrador, restabeleceu a súa conta no servidor, escolla «Manter os ficheiros». Se quere que os seus datos sexan eliminados, escolla «Retirar todos os ficheiros».</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -596,17 +596,17 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -1278,7 +1278,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<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>
@@ -1336,17 +1336,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Non é posíbel renomear este cartafol. Devólvalle o nome ao compartido.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado.</translation>
</message>
@@ -1378,12 +1378,12 @@ Recomendámoslle que non o use.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<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>
@@ -1537,12 +1537,12 @@ Tente sincronizalos de novo.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Erro de acceso</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Ten que rexistrarse como usuario %1</translation>
</message>
@@ -1925,27 +1925,27 @@ Tente sincronizalos de novo.</translation>
<translation>Este elemento non foi sincronizado por mor de erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Non foi posíbel abrir o rexistro de sincronización</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index c045577..f4692ef 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<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="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<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="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,7 +1271,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1329,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1371,12 +1371,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1529,12 +1529,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1915,27 +1915,27 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index ee788d9..6e57d28 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Impossibile creare il contesto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Questa sincronizzazione rimuoverà tutti i file nella cartella di sincronizzazione locale '%1'.
Se tu o il tuo amministratore avete ripristinato il tuo account sul server, scegli "Mantieni i file". Se desideri che i dati siano rimossi, scegli "Rimuovi tutti i file".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -596,17 +596,17 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -1277,7 +1277,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<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>
@@ -1335,17 +1335,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Questa cartella non può essere rinominata. Il nome originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Questa cartella non può essere rinominata. Ripristina il nome Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato.</translation>
</message>
@@ -1377,12 +1377,12 @@ Non è consigliabile utilizzarlo.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<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>
@@ -1536,12 +1536,12 @@ Prova a sincronizzare nuovamente.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Errore di accesso</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Devi accedere con l'utente %1</translation>
</message>
@@ -1924,27 +1924,27 @@ Prova a sincronizzare nuovamente.</translation>
<translation>L'elemento non è sincronizzato a causa dell'errore precedente: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Il file è stato aggiunto alla lista ignorati.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 2211461..4b57517 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -211,7 +211,7 @@
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="29"/>
<source>Authentication Required</source>
- <translation>要求される認証</translation>
+ <translation>認証が必要</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/authenticationdialog.cpp" line="31"/>
@@ -254,106 +254,106 @@
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
- <translation>与えられた認証情報が正しくありません。</translation>
+ <translation>入力された資格情報が正しくありません</translation>
</message>
</context>
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>csync-context を作成できません</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 はディレクトリのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 と他 %2 個のファイルが更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>この同期により、ローカルの同期フォルダー '%1'にある全ファイルが削除されます。
あなた、または管理者がサーバー上のアカウントをリセットした場合、「ファイルを残す」を選んでください。データを削除したい場合は、「すべてのファイルを削除」を選んでください。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -513,7 +513,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="139"/>
<source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>選択したフォルダーはシンボリックリンクです。このリンクの参照先のフォルダーには、既に登録されているフォルダーが含まれます。</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
@@ -597,17 +597,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -865,7 +865,7 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/mirall/networksettings.ui" line="134"/>
<source>Proxy server requires authentication</source>
- <translation>プロキシサーバーは認証が必要です</translation>
+ <translation>プロキシサーバーには認証が必要</translation>
</message>
<message>
<location filename="../src/mirall/networksettings.ui" line="190"/>
@@ -1204,7 +1204,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
- <translation>このフォルダまたはその中のファイルが他のプログラムで開かれているため、このフォルダの削除やバックアップができません。このフォルダやファイルを閉じてから再試行するか、このセットアップをキャンセルしてください。</translation>
+ <translation>フォルダーまたはその中にあるファイルが他のプログラムで開かれているため、フォルダーの削除やバックアップができません。フォルダーまたはファイルを閉じてから再試行するか、セットアップをキャンセルしてください。</translation>
</message>
</context>
<context>
@@ -1271,15 +1271,15 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="449"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation type="unfinished"/>
+ <translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません!</translation>
</message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation type="unfinished"/>
+ <translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません!</translation>
</message>
</context>
<context>
@@ -1295,7 +1295,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="114"/>
<source>Attention, possible case sensitivity clash with %1</source>
- <translation type="unfinished"/>
+ <translation>注意: %1 で大文字小文字が競合している可能性</translation>
</message>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="119"/>
@@ -1308,7 +1308,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
<source>Could not remove %1 because of a local file name clash</source>
- <translation type="unfinished"/>
+ <translation>%1 はローカルファイル名が衝突しているため削除できませんでした</translation>
</message>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
@@ -1321,7 +1321,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="196"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
- <translation type="unfinished"/>
+ <translation>ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません</translation>
</message>
</context>
<context>
@@ -1335,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダー名は変更できません。元の名前に戻します。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。</translation>
</message>
@@ -1377,14 +1377,14 @@ It is not advisable to use it.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation type="unfinished"/>
+ <translation>サーバーは最終チャンクを認識しません。(e-tag が存在しません)</translation>
</message>
</context>
<context>
@@ -1536,14 +1536,14 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>ログインエラー</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
- <translation>ユーザ %1 としてログインする必要があります</translation>
+ <translation>ユーザー %1 としてログインする必要があります</translation>
</message>
</context>
<context>
@@ -1556,12 +1556,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="62"/>
<source>Reauthentication required</source>
- <translation type="unfinished"/>
+ <translation>再認証が必要</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="62"/>
<source>Your session has expired. You need to re-login to continue to use the client.</source>
- <translation type="unfinished"/>
+ <translation>セッションの期限が切れました。クライアントを使用し続けるには再ログインが必要です。</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
@@ -1924,27 +1924,27 @@ It is not advisable to use it.</source>
<translation>このアイテムは、以前にエラーが発生していたため同期させません: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同期の際にシンボリックリンクはサポートしていません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>対象ファイルは無視した一覧に登録しています</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
@@ -1975,7 +1975,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="179"/>
<source>Disconnected from server</source>
- <translation>サーバと切断しました</translation>
+ <translation>サーバーから切断しました</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="211"/>
@@ -2242,7 +2242,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetuppage.ui" line="147"/>
<source>Enter the url of the ownCloud you want to connect to (without http or https).</source>
- <translation>接続するownCloudのURL(httpやhttpsを含めない)を入力してください。</translation>
+ <translation>接続するownCloudのURLを(httpやhttpsを含めずに)入力してください。</translation>
</message>
<message>
<location filename="../src/wizard/owncloudsetupnocredspage.ui" line="83"/>
@@ -2331,7 +2331,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/owncloudtheme.cpp" line="95"/>
<source>If you don't have an ownCloud server yet, see <a href="https://owncloud.com">owncloud.com</a> for more info.</source>
<comment>Top text in setup wizard. Keep short!</comment>
- <translation>ownCloudサーバーをまだ持っていない場合、詳細は <a href="https://owncloud.com">owncloud.com</a>を参照してください。</translation>
+ <translation>ownCloudサーバーをまだ所有していない場合は、<a href="https://owncloud.com">owncloud.com</a>で詳細を参照してください。</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 05b74b7..e6d598b 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<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="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokale map %1 bestaat niet.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Deze synchronisatie verwijdert alle bestanden in lokale synchronisatiemap '%1'.
Als u of uw beheerder uw account op de server heeft gereset, kies dan "Bewaar bestanden". Als u uw bestanden wilt verwijderen, kies dan "Verwijder alle bestanden".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle besta
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -596,17 +596,17 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -1278,7 +1278,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<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>
@@ -1336,17 +1336,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Deze map mag niet worden hernoemd. Verander de naam terug in Gedeeld.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet.</translation>
</message>
@@ -1378,12 +1378,12 @@ We adviseren deze site niet te gebruiken.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<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>
@@ -1537,12 +1537,12 @@ Probeer opnieuw te synchroniseren.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Inlogfout</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>U moet inloggen als gebruiker %1</translation>
</message>
@@ -1925,27 +1925,27 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolic links worden niet ondersteund bij het synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>De file is opgenomen op de negeerlijst.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Niet in staat om een synchornisatie journaal te starten.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync journal niet openen</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 3fd28c8..e1b6567 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Nie można utworzyć kontekstu csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>Folder lokalny %1 nie istnieje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Ta synchronizacja usunie wszystkie pliku z lokalnego folderu synchronizacji '%1'.
Jeśli Ty lub Twój administrator zresetowali Twoje konto na serwerze, wybierz "Zachowaj pliki". Jeśli chcesz aby Twoje dane zostały usunięte, wybierz "Usuń wszystkie pliki".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te
Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -596,17 +596,17 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -1278,7 +1278,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<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>
@@ -1336,17 +1336,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Folder ten nie może być zmieniony. Został zmieniony z powrotem do pierwotnej nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Przywrócono oryginalny plik</translation>
</message>
@@ -1378,12 +1378,12 @@ Niezalecane jest jego użycie.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<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>
@@ -1537,12 +1537,12 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Błąd logowania</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Musisz zalogować się jako użytkownik %1</translation>
</message>
@@ -1557,12 +1557,12 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="62"/>
<source>Reauthentication required</source>
- <translation type="unfinished"/>
+ <translation>Wymagana powtórna autoryzacja</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="62"/>
<source>Your session has expired. You need to re-login to continue to use the client.</source>
- <translation type="unfinished"/>
+ <translation>Twoja sesja wygasła. Musisz ponownie się zalogować, aby nadal używać klienta</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
@@ -1925,27 +1925,27 @@ Niezalecane jest jego użycie.</translation>
<translation>Ten element nie jest zsynchronizowane z powodu poprzednich błędów: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linki symboliczne nie są wspierane przy synchronizacji. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Plik jest na liście plików ignorowanych.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nie można zainicjować synchronizacji dziennika.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index df8bd43..f1cdad3 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Impossível criar 'csync-context'</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>Não é possível ler %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronização irá remover todos os ficheiros sincronizados na pasta local '%1'.
Se você ,ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -361,17 +361,17 @@ Are you sure you want to perform this operation?</source>
Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -595,17 +595,17 @@ 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="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou </translation>
</message>
@@ -1275,7 +1275,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1333,17 +1333,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. A alterar para nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor renomeie para o seu nome original: Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mas faz parte de uma partilha só de leitura. O ficheiro original foi restaurado.</translation>
</message>
@@ -1375,12 +1375,12 @@ It is not advisable to use it.</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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1534,12 +1534,12 @@ Por favor tente sincronizar novamente.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Erro de login</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Deve fazer o login como utilizador %1.</translation>
</message>
@@ -1923,27 +1923,27 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>O item não está sincronizado devido a erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ficheiros a ignorar.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossível inicializar sincronização 'journal'.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 6619791..956e8f1 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Não é possível criar csync-contexto</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronização irá remover todos os arquivos na pasta de sincronização local '%1'.
Se você ou o administrador tiver que redefinir a sua conta no servidor, escolha "Manter arquivos". Se você deseja que seus dados sejam removidos, escolha "Remover todos os arquivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Deseja remover todos os arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -596,17 +596,17 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
@@ -1276,7 +1276,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<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>
@@ -1334,17 +1334,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. Ele será renomeado de volta ao seu nome original.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor, nomeie-a de volta para Compartilhada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O arquivo foi renomeado mas faz parte de compartilhamento só de leitura. O arquivo original foi restaurado.</translation>
</message>
@@ -1376,12 +1376,12 @@ It is not advisable to use it.</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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<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>
@@ -1535,12 +1535,12 @@ Tente sincronizar novamente.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Erro de Login</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Você deve entrar como usuário %1</translation>
</message>
@@ -1923,27 +1923,27 @@ Tente sincronizar novamente.</translation>
<translation>O item não está sincronizado devido a erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linques simbólicos não são suportados em sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>O arquivo está listado na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Não é possível abrir o arquivo de sincronização</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 2ebde80..74bff04 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Невозможно создать контекст csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальный каталог %1 не существует.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 должен быть каталогом, но не является таковым.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 не читается.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Это действие может удалить все файлы в локальной папке '%1'.
Если вы или ваш администратор заново создали вашу учётную запись на сервере, выберите "Сохранить файлы". Если вы хотите стереть всё - выберите "Удалить все файлы".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -596,17 +596,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1278,7 +1278,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1336,17 +1336,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Эта папка не должна переименовываться. Ей будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Эта папка не должна переименовываться. Пожалуйста, верните ей имя Shared</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1378,12 +1378,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1537,12 +1537,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1925,27 +1925,27 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронизация символических ссылок не поддерживается.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не удалось инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 635ddc1..4400040 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Nemožno vytvoriť "csync-kontext"</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 bol presunutý do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Táto synchronizácia odstráni všetky súbory v lokálnom synchronizačnom priečinku '%1'.
Pokiaľ vy alebo váš správca zresetoval váš účet na serveri, vyberte možnosť "Ponechať súbory". Pokiaľ chcete odstrániť vaše dáta, vyberte možnosť "Odstrániť všetky súbory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -596,17 +596,17 @@ 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="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1278,7 +1278,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1336,17 +1336,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu meno Shared.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Súbor bol premenovaný, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený.</translation>
</message>
@@ -1378,12 +1378,12 @@ Nie je vhodné ju používať.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1536,12 +1536,12 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Chybné prihlásenie</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Musíte sa prihlásiť ako používateľ %1</translation>
</message>
@@ -1924,27 +1924,27 @@ Nie je vhodné ju používať.</translation>
<translation>Položka nebola synchronizovaná kvôli predchádzajúcej chybe: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nie sú podporované v synchronizácii.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Súbor je zapísaný na zozname ignorovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Súbor obsahuje neplatné znaky, ktoré nemôžu byť synchronizované medzi platformami.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Nemožno otvoriť sync žurnál</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 425aa03..09b555b 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<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="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>Krajevna mapa %1 ne obstaja.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<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="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Z usklajevanjem bodo odstranjene vse krajevne datoteke v mapi '%1'.
Če je bil račun na strežniku kakorkoli ponastavljen, izberite možnost "Ohrani datoteke", če pa želite datoteke res odstraniti, izberite drugo možnost.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -513,7 +513,7 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="139"/>
<source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>Označena mapa je simbolična povezava. Že vnaprej nastavljena mapa v mapi vsebuje povezavo do nje.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
@@ -596,19 +596,19 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
- <translation type="unfinished"/>
+ <translation>Povezava prekinjena</translation>
</message>
</context>
<context>
@@ -1205,7 +1205,7 @@ Uporaba ni priporočljiva.</translation>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
- <translation type="unfinished"/>
+ <translation>Nemogoče izbrisati ali narediti varnostno kopijo mape, ker je mapa ali datoteka, ki je v njej v uporabi nekega drugega program. Prosimo zaprite mapo ali datoteko in poizkusite znova ali prekličite instalacijo.</translation>
</message>
</context>
<context>
@@ -1249,7 +1249,7 @@ Uporaba ni priporočljiva.</translation>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="82"/>
<source>Connection Timeout</source>
- <translation type="unfinished"/>
+ <translation>Povezava je prekinjena</translation>
</message>
</context>
<context>
@@ -1278,7 +1278,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1336,17 +1336,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Mape ni dovoljeno preimenovati. Preimenujte jo nazaj na privzeto vrednost.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Datoteka je preimenovana, vendar je označena za souporabo le za branje. Obnovljena je izvirna datoteka.</translation>
</message>
@@ -1378,14 +1378,14 @@ Uporaba ni priporočljiva.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation type="unfinished"/>
+ <translation>Strežnik ni prepoznal zadnjega niza besed. (Ni bilo prisotnih e-značk)</translation>
</message>
</context>
<context>
@@ -1537,12 +1537,12 @@ Te je treba uskladiti znova.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Napaka prijave</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Prijaviti se je treba kot uporabnik %1</translation>
</message>
@@ -1562,7 +1562,7 @@ Te je treba uskladiti znova.</translation>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="62"/>
<source>Your session has expired. You need to re-login to continue to use the client.</source>
- <translation type="unfinished"/>
+ <translation>Vaša seja je potekla.Ponovno se prijavite za nadaljevanje z uporabo odjemalca.</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
@@ -1925,27 +1925,27 @@ Te je treba uskladiti znova.</translation>
<translation>Predmet ni usklajen zaradi predhodne napake: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Usklajevanje simbolnih povezav ni podprto.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Datoteka je na seznamu prezrtih datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
@@ -2340,7 +2340,7 @@ Te je treba uskladiti znova.</translation>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="51"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source>
- <translation type="unfinished"/>
+ <translation><p><small>Zgrajeno s pomočjo Git revizije <a href="%1">%2</a> na %3, %4 uporablja Qt %5.</small></p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="58"/>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 6c9eef9..c90e780 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>Kan inte skapa csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Denna synk skulle radera alla filer i den lokala mappen '%1'.
Om systemadministratören har återställt ditt konto på servern, välj "Behåll filer". Om du vill att dina filer ska raderas, välj "Radera alla filer".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -596,17 +596,17 @@ 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="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -1278,7 +1278,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<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>
@@ -1336,17 +1336,17 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denna mapp får inte byta namn. Den kommer att döpas om till sitt ursprungliga namn.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Denna mapp får ej döpas om. Vänligen döp den till Delad igen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>En fil döptes om men är en del av en endast-läsbar delning. Original filen återställdes.</translation>
</message>
@@ -1378,12 +1378,12 @@ Det är inte lämpligt använda den.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<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>
@@ -1537,12 +1537,12 @@ Försök att synka dessa igen.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Login fel</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>Du måste logga in som en användare %1</translation>
</message>
@@ -1925,27 +1925,27 @@ Försök att synka dessa igen.</translation>
<translation>Objektet kunde inte synkas på grund av tidigare fel: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symboliska länkar stöds ej i synkningen.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Filen är listad i ignorerings listan.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Filen innehåller ogiltiga tecken som inte kan synkas oberoende av plattform.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Kan inte initialisera en synk journal. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 19f3296..faf590d 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>โฟลเดอร์ในเครื่อง %1 ไม่มีอยู่</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<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="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,7 +1271,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1329,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1371,12 +1371,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1529,12 +1529,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1915,27 +1915,27 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 55b24d7..6dcb05a 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<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="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<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="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<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="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<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="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<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="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Bu eşitleme, yerel eşitleme klasörü '%1' içindeki tüm dosyaları kaldıracak.
Eğer siz veya yöneticiniz sunucudaki hesabınızı sıfırlamışsa, "Dosyaları koru" seçin. Eğer verinizin kaldırılmasını istiyorsanız, "Tüm dosyaları kaldır" seçin.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -596,17 +596,17 @@ 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="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>Bağlantı Zaman Aşımı</translation>
</message>
@@ -1278,7 +1278,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<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>
@@ -1336,17 +1336,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Lütfen Shared olarak geri adlandırın.</translation>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Dosya adlandırıldı ancak salt okunur paylaşımın bir parçası. Özgün dosya geri yüklendi.</translation>
</message>
@@ -1378,12 +1378,12 @@ Kullanmanız önerilmez.</translation>
<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="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<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="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<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>
@@ -1537,12 +1537,12 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>Oturum Açma Hatası</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation>%1 kullanıcısı olarak oturum açmalısınız</translation>
</message>
@@ -1925,27 +1925,27 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>Bu öge önceki hatalar koşullarından dolayı eşitlenemiyor: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sembolik bağlantılar eşitlemede desteklenmiyor.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>Bir eşitleme günlüğü başlatılamadı.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>Eşitleme günlüğü açılamıyor</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 2620185..c1ef929 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальна тека %1 не існує.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 повинна бути текою, але нею не є.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<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="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,7 +1271,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1329,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1371,12 +1371,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1529,12 +1529,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1915,27 +1915,27 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 62a5fc1..8dacf8c 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation>不能生成 csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>本地文件夹 %1 不存在。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 应为目录但并不是。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已移除。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已下载。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 和 %2 个其它文件已更新。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已更新。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已移动至 %2。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<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="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation>删除所有文件?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -1271,7 +1271,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1329,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1371,12 +1371,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1529,12 +1529,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation>登录错误</translation>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1915,27 +1915,27 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation>无法初始化同步日志</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index e51f1fa..334ef84 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -260,116 +260,116 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="107"/>
+ <location filename="../src/mirall/folder.cpp" line="118"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="165"/>
+ <location filename="../src/mirall/folder.cpp" line="176"/>
<source>Local folder %1 does not exist.</source>
<translation>本地資料夾 %1 不存在</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="168"/>
+ <location filename="../src/mirall/folder.cpp" line="179"/>
<source>%1 should be a directory but is not.</source>
<translation>資料夾不存在, %1 必須是資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="171"/>
+ <location filename="../src/mirall/folder.cpp" line="182"/>
<source>%1 is not readable.</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="323"/>
+ <location filename="../src/mirall/folder.cpp" line="334"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="409"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<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="411"/>
+ <location filename="../src/mirall/folder.cpp" line="422"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="416"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<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="418"/>
+ <location filename="../src/mirall/folder.cpp" line="429"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="434"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="441"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="443"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="448"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="450"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="447"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="697"/>
+ <location filename="../src/mirall/folder.cpp" line="708"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="700"/>
+ <location filename="../src/mirall/folder.cpp" line="711"/>
<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="704"/>
+ <location filename="../src/mirall/folder.cpp" line="715"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="706"/>
+ <location filename="../src/mirall/folder.cpp" line="717"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="718"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,17 +593,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="393"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
<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="633"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,7 +1271,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="443"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1329,17 +1329,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateRemoteRename</name>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="242"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="233"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="244"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="235"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagatorjobs.cpp" line="259"/>
+ <location filename="../src/mirall/propagatorjobs.cpp" line="250"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
@@ -1371,12 +1371,12 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="272"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="282"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1529,12 +1529,12 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::ShibbolethCredentials</name>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibbolethcredentials.cpp" line="259"/>
+ <location filename="../src/creds/shibbolethcredentials.cpp" line="267"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
@@ -1915,27 +1915,27 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="274"/>
+ <location filename="../src/mirall/syncengine.cpp" line="280"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="283"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="286"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="448"/>
+ <location filename="../src/mirall/syncengine.cpp" line="453"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="545"/>
+ <location filename="../src/mirall/syncengine.cpp" line="549"/>
<source>Cannot open the sync journal</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