[Pkg-owncloud-commits] [owncloud-client] 270/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:17:03 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 dcac2796dd249ddeeaf3a89dfac30dbe3c58fa40
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Sat Mar 29 01:26:34 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_cs.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_de.ts | 76 ++++++++++++++++++++++----------------------
translations/mirall_el.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_en.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_es.ts | 74 +++++++++++++++++++++---------------------
translations/mirall_es_AR.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_et.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_eu.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_fa.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_fi.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_fr.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_gl.ts | 76 ++++++++++++++++++++++----------------------
translations/mirall_hu.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_it.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_ja.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_nl.ts | 74 +++++++++++++++++++++---------------------
translations/mirall_pl.ts | 74 +++++++++++++++++++++---------------------
translations/mirall_pt.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_pt_BR.ts | 74 +++++++++++++++++++++---------------------
translations/mirall_ru.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_sk.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_sl.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_sv.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_th.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_uk.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_zh_CN.ts | 70 ++++++++++++++++++++--------------------
translations/mirall_zh_TW.ts | 70 ++++++++++++++++++++--------------------
translations/pofiles/tr.po | 70 ++++++++++++++++++++--------------------
29 files changed, 1029 insertions(+), 1029 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index d83fdc0..fbf0add 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<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="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -596,12 +596,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1240,17 +1240,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>L'usuari ha aturat la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1258,7 +1258,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1308,18 +1308,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>El fitxer local ha canviat durant la sincronització, es sincronitzarà quan arribi complet</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>L'usuari ha aturat la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1327,22 +1327,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 125de69..174cbd9 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<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="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<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="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -596,12 +596,12 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1242,17 +1242,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizace zrušena uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1260,7 +1260,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Soubor nebo adresář by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation>
</message>
@@ -1310,18 +1310,18 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Místní soubor byl změněn během synchronizace, bude sesynchronizován, jakmile bude kompletní</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizace zrušena uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
</message>
@@ -1329,22 +1329,22 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Rozšíření X-OC-MTime není k dispozici, je vyžadováno ownCloud 5</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 4aed31f..9db3d48 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Kann keinen CSync-Kontext erstellen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokales Verzeichnis %1 existiert nicht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
- <translation>%1 und %2 andere Dateien wurden aktualisiert</translation>
+ <translation>%1 und %2 andere Dateien wurden aktualisiert.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -597,12 +597,12 @@ 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="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1243,17 +1243,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1261,7 +1261,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Eine Datei oder Verzeichnis wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation>
</message>
@@ -1311,18 +1311,18 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert, synchronisieren Sie nochmals sobald die aktuelle Datei vollständig angekommen ist</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
@@ -1330,22 +1330,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge 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>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Keine X-OC-MTime Erweiterung vorhanden, owncloud 5 ist erforderlich</translation>
</message>
@@ -1501,12 +1501,12 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>Login Error</source>
- <translation type="unfinished"/>
+ <translation>Log-In Fehler</translation>
</message>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>You must sign in as user %1</source>
- <translation type="unfinished"/>
+ <translation>Sie müssen sich als %1 einloggen</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 9d10228..f7c976e 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Αδυναμία δημιουργίας πλαισίου csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 επρεπε να ειναι χωρος αποθηκευσης αλλα δεν ειναι.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation> %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -596,12 +596,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1242,17 +1242,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1260,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1310,18 +1310,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού, θα συγχρονιστεί και πάλι όταν φτάσει πλήρως</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Ο συγχρονισμός ματαιώθηκε από το χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1329,22 +1329,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 768326e..5b82c7b 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>%1 should be a directory but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -595,12 +595,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
@@ -1237,17 +1237,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
@@ -1255,7 +1255,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1305,18 +1305,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
@@ -1324,22 +1324,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 6c985e8..ea7f1c8 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>Carpeta local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<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="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -596,12 +596,12 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1242,17 +1242,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>La sincronización ha sido Interrumpida por el usuario</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1260,7 +1260,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Un archivo o directorio fue eliminado de una carpeta compartida en modo de solo lectura, pero la recuperación falló: %1</translation>
</message>
@@ -1310,18 +1310,18 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Fichero local modificado mientras se sincronizaba, sincronice otra vez cuando termine de editar</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>La sincronización ha sido Interrumpida por el usuario</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
</message>
@@ -1329,22 +1329,22 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge 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>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>No hay una extensión X-OC-MTime, se requiere ownCloud 5</translation>
</message>
@@ -1500,12 +1500,12 @@ Intente sincronizar los archivos nuevamente.</translation>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>Login Error</source>
- <translation type="unfinished"/>
+ <translation>Error al iniciar sesión</translation>
</message>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>You must sign in as user %1</source>
- <translation type="unfinished"/>
+ <translation>Debe iniciar sesión como el usuario %1</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 7f52acd..8dedd3b 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -596,12 +596,12 @@ 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="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1240,17 +1240,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizaciójn abortada por el usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1258,7 +1258,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1308,18 +1308,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Los archivos locales han cambiado durante la sincronización, la primera vez ha funcionado completamente</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizaciójn abortada por el usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1327,22 +1327,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 3b7af87..f18e05b 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Ei suuda luua csync-konteksti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>Kohalikku kausta %1 pole olemas.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -596,12 +596,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1242,17 +1242,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Sünkroniseering katkestati kasutaja poolt.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1260,7 +1260,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1310,18 +1310,18 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Kohalik fail muutus sünkroniseerimise ajal, sünkroniseerin kuni ülekanne on täielik</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Sünkroniseering katkestati kasutaja poolt.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1329,22 +1329,22 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 62e76e0..4cf7dcb 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1237,17 +1237,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1255,7 +1255,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1305,18 +1305,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1324,22 +1324,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 60da848..efe0f54 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>پوشه محلی %1 موجود نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 باید یک پوشه باشد اما نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1235,17 +1235,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1253,7 +1253,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1303,18 +1303,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 98ab3c6..a2454c2 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1236,17 +1236,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1254,7 +1254,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1304,18 +1304,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1323,22 +1323,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 09aa673..a671f42 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<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="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<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="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -596,12 +596,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1242,17 +1242,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>La synchronisation a été interrompue par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1260,7 +1260,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Un fichier ou un dossier a été supprimé du partage en lecture seule, mais la restauration à échoué : %1</translation>
</message>
@@ -1310,18 +1310,18 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Fichier local modifié pendant la synchronisation, la synchronisation redémarrera lorsque ce sera terminé</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>La synchronisation a été interrompue par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation>
</message>
@@ -1329,22 +1329,22 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge 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>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Aucune extension X-OC-MTime, ownCloud 5 est exigé</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 0166092..9c07e43 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<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="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<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="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -596,12 +596,12 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1242,17 +1242,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>A sincronización foi interrompida polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1260,7 +1260,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Foi retirado un ficheiro ou directorio desde unha compartición de só lectura, mais non foi posíbel a súa restauración: %1</translation>
</message>
@@ -1310,18 +1310,18 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>O ficheiro local cambiou durante a sincronización, sincronizando unha vez quedou completado</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>A sincronización foi interrompida polo usuario.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
@@ -1329,22 +1329,22 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presentes)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Non existe a extensión X-OC-MTime, require ownCloud 5</translation>
</message>
@@ -1500,12 +1500,12 @@ Tente sincronizalos de novo.</translation>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>Login Error</source>
- <translation type="unfinished"/>
+ <translation>Erro de acceso</translation>
</message>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>You must sign in as user %1</source>
- <translation type="unfinished"/>
+ <translation>Ten que rexistrarse como usuario %1</translation>
</message>
</context>
<context>
@@ -2289,7 +2289,7 @@ Tente sincronizalos de novo.</translation>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
<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>Construído desde a revisión <a href="%1">%2</a> no Git o %3, %4 empregando Qt %5.</small><p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="55"/>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index b1193a7..ea9997f 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<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="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1235,17 +1235,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1253,7 +1253,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1303,18 +1303,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 2c3a82b..1af0d75 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Impossibile creare il contesto csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -596,12 +596,12 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1241,17 +1241,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1259,7 +1259,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Un file o una cartella è stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1</translation>
</message>
@@ -1309,18 +1309,18 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Un file locale è cambiato durante la sincronizzazione, nuova sincronizzazione alla ricezione.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
@@ -1328,22 +1328,22 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Nessun e-tag era presente)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Non è presente l'estensione X-OC-MTime, è richiesto ownCloud 5</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 37afdae..6797aac 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>csync-context を作成できません</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 はディレクトリのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 と他 %2 個のファイルが更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -597,12 +597,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
@@ -1241,17 +1241,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>同期はユーザーによって中止されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
@@ -1259,7 +1259,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>ファイルまたはディレクトリが読み込み専用の共有から削除されましたが、復元に失敗しました: %1</translation>
</message>
@@ -1309,18 +1309,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>同期中にローカルファイルが変更されました。完了してからもう一度同期してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>同期はユーザーによって中止されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。それは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
@@ -1328,22 +1328,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しませんでした。（e-tag が存在しませんでした）</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>X-OC-MTime 拡張がありません、 ownCloud 5 が必要です。</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index f7a73f8..6c1b2f3 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<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="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokale map %1 bestaat niet.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -596,12 +596,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1242,17 +1242,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1260,7 +1260,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Er is een bestand of map verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation>
</message>
@@ -1310,18 +1310,18 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Een lokaal bestand is gewijzigd tijdens het synchroniseren, wordt gesynchroniseerd als het volledig is aangekomen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
</message>
@@ -1329,22 +1329,22 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge 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>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Er is geen X-OC-MTime extensie aanwezig, ownCloud 5 is vereist</translation>
</message>
@@ -1500,12 +1500,12 @@ Probeer opnieuw te synchroniseren.</translation>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>Login Error</source>
- <translation type="unfinished"/>
+ <translation>Inlogfout</translation>
</message>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>You must sign in as user %1</source>
- <translation type="unfinished"/>
+ <translation>U moet inloggen als gebruiker %1</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 19ae46b..7bc4bac 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Nie można utworzyć kontekstu csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>Folder lokalny %1 nie istnieje.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -596,12 +596,12 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1242,17 +1242,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizacja anulowane przez użytkownika.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1260,7 +1260,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Plik lub katalog został usunięty z udziału z prawem tylko do odczytu, ale przywrócenie nie powiodło się: %1</translation>
</message>
@@ -1310,18 +1310,18 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Lokalny plik zmienił się podczas synchronizacji, synchronizuję ponownie ponieważ dotarł w całości.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizacja anulowane przez użytkownika.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
</message>
@@ -1329,22 +1329,22 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge 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>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Brak rozszerzenia X-OC-MTime, wymagany ownCloud 5</translation>
</message>
@@ -1500,12 +1500,12 @@ Niezalecane jest jego użycie.</translation>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>Login Error</source>
- <translation type="unfinished"/>
+ <translation>Błąd logowania</translation>
</message>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>You must sign in as user %1</source>
- <translation type="unfinished"/>
+ <translation>Musisz zalogować się jako użytkownik %1</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 4633c38..5d20bb5 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Impossível criar 'csync-context'</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>Não é possível ler %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -595,12 +595,12 @@ 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="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1239,17 +1239,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi cancelada pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1257,7 +1257,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Um ficheiro ou um directório foi removido de uma partilha apenas de leitura, mas o restauro falhou: %1</translation>
</message>
@@ -1307,18 +1307,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Ficheiro local foi alterado durante a sincronização. A sincronizar quando chegar na totalidade</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi cancelada pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1326,22 +1326,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 70c4181..19b7fc1 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<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="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -596,12 +596,12 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1240,17 +1240,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi abortada pelo usuário.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1258,7 +1258,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Um arquivo ou diretório foi removido de um compartilhamento somente de leitura, mas a restauração falhou: %1</translation>
</message>
@@ -1308,18 +1308,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Arquivo local alterado durante a sincronização, sincronizando uma vez que chegou completamente</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>A sincronização foi abortada pelo usuário.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
@@ -1327,22 +1327,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último pedaço. (Nenhuma e-etiqueta estava presente)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Sem extensão X-OC-mtime, ownCloud 5 é necessário</translation>
</message>
@@ -1498,12 +1498,12 @@ Tente sincronizar novamente.</translation>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>Login Error</source>
- <translation type="unfinished"/>
+ <translation>Erro de Login</translation>
</message>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="295"/>
<source>You must sign in as user %1</source>
- <translation type="unfinished"/>
+ <translation>Você deve entrar como usuário %1</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index d0dd201..76878af 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Невозможно создать контекст csync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальный каталог %1 не существует.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 должен быть каталогом, но не является таковым.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 не читается.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -596,12 +596,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
@@ -1242,17 +1242,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Синхронизация прервана пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
@@ -1260,7 +1260,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1310,18 +1310,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Локальный файл изменился в процессе синхронизации, повторяем процесс</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Синхронизация прервана пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1329,22 +1329,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index aa5ef39..38cba10 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Nemožno vytvoriť "csync-kontext"</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -596,12 +596,12 @@ 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="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1241,17 +1241,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizácia zrušená používateľom.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1259,7 +1259,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1309,18 +1309,18 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Lokálny súbor bol počas synchronizácie zmenený, zosynchronizuje sa, akonáhle bude kompletný</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizácia zrušená používateľom.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1328,22 +1328,22 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index e50d7f4..1672a51 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<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="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>Krajevna mapa %1 ne obstaja.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -596,12 +596,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<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>
@@ -1242,17 +1242,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Usklajevanje je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<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>
@@ -1260,7 +1260,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Datoteka ali mapa je bila odstranjena iz mesta v souporabi, ki je nastavljeno le za branje, obnavljanje pa je spodletelo: %1</translation>
</message>
@@ -1310,18 +1310,18 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena. Usklajena bo, ko bo shranjena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Usklajevanje je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1329,22 +1329,22 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Ni prejetega odziva s strežnnika s potrdilom o prejemu zadnjega dela datoteke (ni prejete oznake).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>Ni razširitve X-OC-MTime, saj zahteva namestitev ownCloud 5.</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 5f9dcf0..dd57e96 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>Kan inte skapa csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<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="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -596,12 +596,12 @@ 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="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1240,17 +1240,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1258,7 +1258,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1308,18 +1308,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1327,22 +1327,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 7154d1e..fab4d91 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>โฟลเดอร์ในเครื่อง %1 ไม่มีอยู่</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 ควรเป็นไดเร็กทอรี่แต่ไม่ได้เป็น</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1235,17 +1235,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1253,7 +1253,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1303,18 +1303,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 65c81c8..6705707 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальна тека %1 не існує.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 повинна бути текою, але нею не є.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1235,17 +1235,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1253,7 +1253,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1303,18 +1303,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index ab9ba0b..e3b83de 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation>不能生成 csync-context</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>本地文件夹 %1 不存在。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 应为目录但并不是。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1235,17 +1235,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1253,7 +1253,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1303,18 +1303,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 73a5b7e..07c9c62 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="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<source>Local folder %1 does not exist.</source>
<translation>本地資料夾 %1 不存在</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>%1 should be a directory but is not.</source>
<translation>資料夾不存在, %1 必須是資料夾</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,12 +593,12 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1235,17 +1235,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
@@ -1253,7 +1253,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
@@ -1303,18 +1303,18 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
@@ -1322,22 +1322,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index 3e088e8..08b6f0e 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -260,100 +260,100 @@
<context>
<name>Mirall::Folder</name>
<message>
- <location filename="../src/mirall/folder.cpp" line="100"/>
+ <location filename="../src/mirall/folder.cpp" line="96"/>
<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="158"/>
+ <location filename="../src/mirall/folder.cpp" line="154"/>
<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="161"/>
+ <location filename="../src/mirall/folder.cpp" line="157"/>
<source>%1 should be a directory but is not.</source>
<translation>%1 bir dizin olmalıdır ancak değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="164"/>
+ <location filename="../src/mirall/folder.cpp" line="160"/>
<source>%1 is not readable.</source>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="324"/>
+ <location filename="../src/mirall/folder.cpp" line="312"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="410"/>
+ <location filename="../src/mirall/folder.cpp" line="398"/>
<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="412"/>
+ <location filename="../src/mirall/folder.cpp" line="400"/>
<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="417"/>
+ <location filename="../src/mirall/folder.cpp" line="405"/>
<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="419"/>
+ <location filename="../src/mirall/folder.cpp" line="407"/>
<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="424"/>
+ <location filename="../src/mirall/folder.cpp" line="412"/>
<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="426"/>
+ <location filename="../src/mirall/folder.cpp" line="414"/>
<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="431"/>
+ <location filename="../src/mirall/folder.cpp" line="419"/>
<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="433"/>
+ <location filename="../src/mirall/folder.cpp" line="421"/>
<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="438"/>
+ <location filename="../src/mirall/folder.cpp" line="426"/>
<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="440"/>
+ <location filename="../src/mirall/folder.cpp" line="428"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="448"/>
+ <location filename="../src/mirall/folder.cpp" line="436"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="707"/>
+ <location filename="../src/mirall/folder.cpp" line="674"/>
<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="710"/>
+ <location filename="../src/mirall/folder.cpp" line="677"/>
<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="714"/>
+ <location filename="../src/mirall/folder.cpp" line="681"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="716"/>
+ <location filename="../src/mirall/folder.cpp" line="683"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="717"/>
+ <location filename="../src/mirall/folder.cpp" line="684"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -596,12 +596,12 @@ 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="314"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="324"/>
<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="320"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="330"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket altık. Sonraki işlemde yeniden denenecek.</translation>
</message>
@@ -1241,17 +1241,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="336"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
<source>Sync was aborted by user.</source>
<translation>Eşitleme kullanıcı tarafından iptal edildi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="391"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="395"/>
<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_legacy.cpp" line="401"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket altık. Sonraki işlemde yeniden denenecek.</translation>
</message>
@@ -1259,7 +1259,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateItemJob</name>
<message>
- <location filename="../src/mirall/owncloudpropagator.cpp" line="130"/>
+ <location filename="../src/mirall/owncloudpropagator.cpp" line="136"/>
<source>A file or directory was removed from a read only share, but restoring failed: %1</source>
<translation>Bir dosya veya dizin bir salt okunur paylaşımdan kaldırılmıştı, ancak geri yükleme başarısız oldu: %1</translation>
</message>
@@ -1309,18 +1309,18 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="149"/>
- <location filename="../src/mirall/propagator_legacy.cpp" line="208"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="153"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="212"/>
<source>Local file changed during sync, syncing once it arrived completely</source>
<translation>Eşitleme sırasında yerel dosya değişti, tamamen ulaştıktan sonra bir kez eşitlenecek</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="152"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="156"/>
<source>Sync was aborted by user.</source>
<translation>Eşitleme kullanıcı tarafından iptal edildi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="158"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="162"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
@@ -1328,22 +1328,22 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="191"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="201"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="216"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="226"/>
<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="226"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="236"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="257"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="267"/>
<source>No X-OC-MTime extension, ownCloud 5 is required</source>
<translation>X-OC-MTime uzantısı yok, ownCloud 5 gerekli</translation>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list