[Pkg-owncloud-commits] [owncloud-client] 225/332: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Aug 14 21:07: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 3cb93510ac4d5a961e5e8b13591bbfc0b2498dbc
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Sat Jul 19 01:25:30 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 78 +++++++++++++-----------
translations/mirall_cs.ts | 78 +++++++++++++-----------
translations/mirall_de.ts | 78 +++++++++++++-----------
translations/mirall_el.ts | 78 +++++++++++++-----------
translations/mirall_en.ts | 78 +++++++++++++-----------
translations/mirall_es.ts | 78 +++++++++++++-----------
translations/mirall_es_AR.ts | 78 +++++++++++++-----------
translations/mirall_et.ts | 78 +++++++++++++-----------
translations/mirall_eu.ts | 78 +++++++++++++-----------
translations/mirall_fa.ts | 78 +++++++++++++-----------
translations/mirall_fi.ts | 78 +++++++++++++-----------
translations/mirall_fr.ts | 78 +++++++++++++-----------
translations/mirall_gl.ts | 78 +++++++++++++-----------
translations/mirall_hu.ts | 78 +++++++++++++-----------
translations/mirall_it.ts | 78 +++++++++++++-----------
translations/mirall_ja.ts | 78 +++++++++++++-----------
translations/mirall_nl.ts | 78 +++++++++++++-----------
translations/mirall_pl.ts | 78 +++++++++++++-----------
translations/mirall_pt.ts | 78 +++++++++++++-----------
translations/mirall_pt_BR.ts | 78 +++++++++++++-----------
translations/mirall_ru.ts | 137 +++++++++++++++++++++++--------------------
translations/mirall_sk.ts | 78 +++++++++++++-----------
translations/mirall_sl.ts | 78 +++++++++++++-----------
translations/mirall_sv.ts | 78 +++++++++++++-----------
translations/mirall_th.ts | 78 +++++++++++++-----------
translations/mirall_tr.ts | 78 +++++++++++++-----------
translations/mirall_uk.ts | 78 +++++++++++++-----------
translations/mirall_zh_CN.ts | 78 +++++++++++++-----------
translations/mirall_zh_TW.ts | 78 +++++++++++++-----------
29 files changed, 1306 insertions(+), 1015 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index f153739..1eefecb 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -601,7 +601,12 @@ Esteu segur que voleu executar aquesta operació?</translation>
<translation>Hem rebut un E-Tag diferent en la represa. Es comprovarà la pròxima vegada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Temps de connexió excedit</translation>
</message>
@@ -1079,126 +1084,126 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Ha fallat en canviar el nom de la carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>la carpeta de sincronització %1 s'ha creat correctament!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Intentant connectar amb %1 a %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">S'ha connectat correctament amb %1: %2 versió %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Error: credencials incorrectes.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>La carpeta local %1 ja existeix, s'està configurant per sincronitzar.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Creant carpeta local de sincronització %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>correcte</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>ha fallat.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>No s'ha pogut crear la carpeta local %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Ha fallat la connexió amb %1 a %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>No heu especificat cap carpeta remota!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Error: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>creant la carpeta a ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>La carpeta remota %1 s'ha creat correctament.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>La carpeta remota %1 ja existeix. S'hi està connectant per sincronitzar-les.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La creació de la carpeta ha resultat en el codi d'error HTTP %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Ha fallat la creació de la carpeta perquè les credencials proporcionades són incorrectes!<br/>Aneu enrera i comproveu les credencials.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">La creació de la carpeta remota ha fallat, probablement perquè les credencials facilitades són incorrectes.</font><br/>Comproveu les vostres credencials.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>La creació de la carpeta remota %1 ha fallat amb l'error <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>S'ha establert una connexió de sincronització des de %1 a la carpeta remota %2.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Connectat amb èxit a %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>No s'ha pogut establir la connexió amb %1. Comproveu-ho de nou.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>No es pot esborrar i restaurar la carpeta perquè una carpeta o un fitxer de dins està obert en un altre programa. Tanqueu la carpeta o el fitxer i intenteu-ho de nou o cancel·leu la configuració.</translation>
</message>
@@ -1250,22 +1255,27 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No s'ha rebut cap E-Tag del servidor, comproveu el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>hem rebut un E-Tag diferent en la represa. Es comprovarà la pròxima vegada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d'un fitxer local!</translation>
</message>
@@ -1273,7 +1283,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d'un fitxer local!</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 700a750..7c3d77c 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -601,7 +601,12 @@ Opravdu chcete provést tuto akci?</translation>
<translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Spojení vypršelo</translation>
</message>
@@ -1079,126 +1084,126 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Přejmenování složky selhalo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Místní synchronizovaná složka %1 byla vytvořena úspěšně!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Pokouším se připojit k %1 na %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Úspěšně připojeno k %1: %2 verze %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Chyba: nesprávné přihlašovací údaje.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Místní synchronizovaná složka %1 již existuje, nastavuji ji pro synchronizaci.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Vytvářím místní synchronizovanou složku %1... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>selhalo.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Nelze vytvořit místní složku %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Selhalo spojení s %1 v %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Žádná vzdálená složka nenastavena!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Chyba: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>vytvářím složku na ownCloudu: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Vzdálená složka %1 byla úspěšně vytvořena.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Vzdálená složka %1 již existuje. Spojuji ji pro synchronizaci.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Vytvoření složky selhalo HTTP chybou %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.<br/>Vraťte se, prosím, zpět a zkontrolujte je.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Vytvoření vzdálené složky selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.</font><br/>Vraťte se, prosím, zpět a zkontrolujte je.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Vytváření vzdálené složky %1 selhalo s chybou <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Bylo nastaveno synchronizované spojení z %1 do vzdáleného adresáře %2.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Úspěšně spojeno s %1.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Spojení s %1 nelze navázat. Prosím zkuste to znovu.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Nelze odstranit a zazálohovat adresář, protože adresář nebo soubor v něm je otevřen v jiném programu. Prosím zavřete adresář nebo soubor a zkuste znovu nebo zrušte akci.</translation>
</message>
@@ -1250,22 +1255,27 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizace zrušena uživatelem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému.</translation>
</message>
@@ -1273,7 +1283,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému.</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index db1dc1d..2ae152e 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -602,7 +602,12 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -1080,126 +1085,126 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Ordner umbenennen fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokaler Sync-Ordner %1 erfolgreich erstellt!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Versuche zu %1 an %2 zu verbinden...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Erfolgreich mit %1 verbunden: %2 Version %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Fehler: Falsche Anmeldeinformationen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokaler Sync-Ordner %1 existiert bereits, aktiviere Synchronistation.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Erstelle lokalen Sync-Ordner %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Der lokale Ordner %1 konnte nicht angelegt werden</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Die Verbindung zu %1 auf %2:<br/>%3 konnte nicht hergestellt werden</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Keinen fernen Ordner spezifiziert!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Fehler: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>erstelle Ordner auf ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Remoteordner %1 erfolgreich erstellt.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Der Ordner %1 ist auf dem Server bereits vorhanden. Verbinde zur Synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehen Sie zurück und überprüfen Sie die Zugangsdaten.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Die Remote-Ordner-Erstellung ist fehlgeschlagen, vermutlich sind die angegebenen Zugangsdaten falsch.</font><br/>Bitte gehen Sie zurück und überprüfen Sie Ihre Zugangsdaten.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Eine Synchronisationsverbindung für Ordner %1 zum entfernten Ordner %2 wurde eingerichtet.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Erfolgreich verbunden mit %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Die Verbindung zu %1 konnte nicht hergestellt werden. Bitte prüfen Sie die Einstellungen erneut.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Kann den Ordner nicht entfernen und sichern, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner ode die Datei oder beenden Sie das Setup.</translation>
</message>
@@ -1251,22 +1256,27 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation>
</message>
@@ -1274,7 +1284,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index 1a842b2..47dda3a 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -602,7 +602,12 @@ Are you sure you want to perform this operation?</source>
<translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
</message>
@@ -1080,126 +1085,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Αποτυχία μετονομασίας φακέλου</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Επιτυχής δημιουργία τοπικού φακέλου %1 για συγχρονισμό!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Προσπάθεια σύνδεσης στο %1 για %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Επιτυχής σύνδεση στο %1: %2 έκδοση %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Σφάλμα: Λάθος διαπιστευτήρια.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Ο τοπικός φάκελος συγχρονισμού %1 υπάρχει ήδη, ρύθμιση για συγχρονισμό.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Δημιουργία τοπικού φακέλου %1 για συγχρονισμό... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>οκ</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>απέτυχε.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Αδυναμία δημιουργίας τοπικού φακέλου %1 </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Αποτυχία σύνδεσης με το %1 στο %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Δεν προσδιορίστηκε κανένας απομακρυσμένος φάκελος!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Σφάλμα: %1 </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>δημιουργία φακέλου στο ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Ο απομακρυσμένος φάκελος %1 δημιουργήθηκε με επιτυχία.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Ο απομακρυσμένος φάκελος %1 υπάρχει ήδη. Θα συνδεθεί για συγχρονισμό. </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Η δημιουργία φακέλου είχε ως αποτέλεσμα τον κωδικό σφάλματος HTTP %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Η δημιουργία απομακρυσμένου φακέλλου απέτυχε επειδή τα διαπιστευτήρια είναι λάθος!<br/>Παρακαλώ επιστρέψετε και ελέγξετε τα διαπιστευτήριά σας.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Η δημιουργία απομακρυσμένου φακέλου απέτυχε, πιθανώς επειδή τα διαπιστευτήρια που δόθηκαν είναι λάθος.</font><br/>Παρακαλώ επιστρέψτε πίσω και ελέγξτε τα διαπιστευτήρια σας.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Η δημιουργία απομακρυσμένου φακέλου %1 απέτυχε με σφάλμα <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Μια σύνδεση συγχρονισμού από τον απομακρυσμένο κατάλογο %1 σε %2 έχει ρυθμιστεί. </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Επιτυχής σύνδεση με %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας του φακέλου διότι ο φάκελος ή ένα αρχείο του είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση.</translation>
</message>
@@ -1251,22 +1256,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>Ο συγχρονισμός ματαιώθηκε από τον χρήστη.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
</message>
@@ -1274,7 +1284,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 74d5290..e8abd57 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -600,7 +600,12 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -1074,126 +1079,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"></translation>
</message>
@@ -1245,22 +1250,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
@@ -1268,7 +1278,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index cf8d3c3..909bfe1 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -601,7 +601,12 @@ Está seguro de que desea realizar esta operación?</translation>
<translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -1079,126 +1084,126 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Error Renombrando Carpeta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Carpeta de sincronización local %1 creada con éxito</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Intentando conectar a %1 desde %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Conectado con éxito a %1: versión %2 %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Error: Credenciales erróneas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>La carpeta de sincronización local %1 ya existe, configurándola para la sincronización.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Creando la carpeta de sincronización local %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>falló.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>No se pudo crear carpeta local %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Error conectando con %1 en %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>No se ha especificado la carpeta remota!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Error: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>creando carpeta en ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Carpeta remota %1 creado correctamente.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>La carpeta remota %1 ya existe. Conectándola para sincronizacion.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La creación de la carpeta causó un error HTTP de código %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!<br/>Por favor, vuelva atrás y comprueba sus credenciales</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">La creación de la carpeta remota ha fallado, probablemente porque las credenciales proporcionadas son incorrectas.</font><br/>Por favor, vuelva atrás y compruebe sus credenciales.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Creación %1 de carpeta remota ha fallado con el error <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Una conexión de sincronización desde %1 al directorio remoto %2 ha sido configurada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>¡Conectado con éxito a %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Conexión a %1 no se pudo establecer. Por favor compruebelo de nuevo.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>No se puede eliminar y respaldar la carpeta porque la misma o un fichero en ella está abierto por otro programa. Por favor, cierre la carpeta o el fichero y reintente, o cancele la instalación.</translation>
</message>
@@ -1250,22 +1255,27 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El fichero %1 no puede ser descargado debido al nombre de la clase de un fichero local!</translation>
</message>
@@ -1273,7 +1283,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>¡El fichero %1 no puede ser descargado debido al nombre de la clase de un fichero local!</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 89ab053..377a5e6 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -600,7 +600,12 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1076,126 +1081,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Error Al Renombrar Directorio</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Directorio local %1 creado</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Intentando conectar a %1 en %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Conectado a %1: versión de %2 %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Error: Credenciales erróneas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>El directorio de sincronización local %1 ya existe, configurándolo para la sincronización.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Creando el directorio %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>aceptar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>Error.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>No fue posible crear el directorio local %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Falló al conectarse a %1 en %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>¡No se ha especificado un directorio remoto!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Error: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>Creando carpeta en ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>El directorio remoto %1 fue creado con éxito.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>El directorio remoto %1 ya existe. Estableciendo conexión para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La creación del directorio resultó en un error HTTP con código de error %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Error al crear el directorio remoto porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Error al crear el directorio remoto, probablemente porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Se prtodujo un error <tt>%2</tt> al crear el directorio remoto %1.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Fue creada una conexión de sincronización desde %1 al directorio remoto %2.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Conectado con éxito a %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>No fue posible establecer la conexión a %1. Por favor, intentalo nuevamente.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
@@ -1247,22 +1252,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1270,7 +1280,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 11162c2..6c59e89 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -601,7 +601,12 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -1079,126 +1084,126 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Kataloogi ümbernimetamine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Kohalik kataloog %1 edukalt loodud!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Püüan ühenduda %1 kohast %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Edukalt ühendatud %1: %2 versioon %3 (4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Viga: Valed kasutajaandmed.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Kohalik kataloog %1 on juba olemas. Valmistan selle ette sünkroniseerimiseks.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Kohaliku kausta %1 sünkroonimise loomine ... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Ei suuda tekitada kohalikku kataloogi %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Ühendumine ebaõnnestus %1 %2-st:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Ühtegi võrgukataloogi pole määratletud!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Viga: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>loon uue kataloogi ownCloudi: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Eemalolev kaust %1 on loodud.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Serveris on kataloog %1 juba olemas. Ühendan selle sünkroniseerimiseks.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Kausta tekitamine lõppes HTTP veakoodiga %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Kataloogi loomine serverisse ebaõnnestus, kuna kasutajatõendid on valed!<br/>Palun kontrolli oma kasutajatunnust ja parooli.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Serveris oleva kataloogi tekitamine ebaõnnestus tõenäoliselt valede kasutajatunnuste tõttu.</font><br/>Palun mine tagasi ning kontrolli kasutajatunnust ning parooli.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Kataloogi %1 tekitamine serverisse ebaõnnestus veaga <tt>%2</tt></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Loodi sünkroniseerimisühendus kataloogist %1 serveri kataloogi %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Edukalt ühendatud %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Ühenduse loomine %1 ebaõnnestus. Palun kontrolli uuesti.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Ei suuda eemaldada ning varundada kataloogi kuna kataloog või selles asuv fail on avatud mõne teise programmi poolt. Palun sulge kataloog või fail ning proovi uuesti või katkesta paigaldus.</translation>
</message>
@@ -1250,22 +1255,27 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>Sünkroniseering katkestati kasutaja poolt.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega.</translation>
</message>
@@ -1273,7 +1283,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega.</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index e2f478c..2a8bc97 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -598,7 +598,12 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1074,126 +1079,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Karpetaren berrizendatzeak huts egin du</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Bertako sinkronizazio %1 karpeta ongi sortu da!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>%2 zerbitzarian dagoen %1 konektatzen...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Konexioa ongi burutu da %1 zerbitzarian: %2 bertsioa %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Errorea: Kredentzial okerrak.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Bertako %1 karpeta dagoeneko existitzen da, sinkronizaziorako prestatzen.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Bertako sinkronizazio %1 karpeta sortzen...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ados</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>huts egin du.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Ezin da %1 karpeta lokala sortu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Ez da urruneko karpeta zehaztu!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Errorea: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>ownClouden karpeta sortzen: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Urruneko %1 karpeta ongi sortu da.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Urruneko %1 karpeta dagoeneko existintzen da. Bertara konetatuko da sinkronizatzeko.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Karpeta sortzeak HTTP %1 errore kodea igorri du</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Urruneko karpeten sortzeak huts egin du ziuraski emandako kredentzialak gaizki daudelako.</font><br/>Mesedez atzera joan eta egiaztatu zure kredentzialak.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Urruneko %1 karpetaren sortzeak huts egin du <tt>%2</tt> errorearekin.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Sinkronizazio konexio bat konfiguratu da %1 karpetatik urruneko %2 karpetara.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>%1-era ongi konektatu da!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>%1 konexioa ezin da ezarri. Mesedez egiaztatu berriz.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
@@ -1245,22 +1250,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1268,7 +1278,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 5ed2a37..0214915 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -598,7 +598,12 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1072,126 +1077,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>تغییر نام پوشه ناموفق بود</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b> پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>تلاش برای اتصال %1 به %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green"> با موفقیت متصل شده است به %1: %2 نسخه %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>پوشه همگام سازی محلی %1 در حال حاضر موجود است، تنظیم آن برای همگام سازی. <br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>ایجاد پوشه همگام سازی محلی %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>خوب</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>ناموفق.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>نمی تواند پوشه محلی ایجاد کند %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>خطا: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>ایجاد کردن پوشه بر روی ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>پوشه از راه دور %1 با موفقیت ایجاد شده است.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>در حال حاضر پوشه از راه دور %1 موجود است. برای همگام سازی به آن متصل شوید.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>ایجاد پوشه از راه دور ناموفق بود به علت اینکه اعتبارهای ارائه شده اشتباه هستند!<br/>لطفا اعتبارهای خودتان را بررسی کنید.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red"> ایجاد پوشه از راه دور ناموفق بود، شاید به علت اعتبارهایی که ارئه شده اند، اشتباه هستند.</font><br/> لطفا باز گردید و اعتبار خود را بررسی کنید.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>ایجاد پوشه از راه دور %1 ناموفق بود با خطا <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>یک اتصال همگام سازی از %1 تا %2 پوشه از راه دور راه اندازی شد.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>با موفقیت به %1 اتصال یافت!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>اتصال به %1 نمی تواند مقرر باشد. لطفا دوباره بررسی کنید.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
@@ -1243,22 +1248,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1266,7 +1276,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 901510a..37ca946 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -599,7 +599,12 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -1075,126 +1080,126 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Kansion nimen muuttaminen epäonnistui</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Paikallinen synkronointikansio %1 luotu onnistuneesti!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Yritetään yhdistetää palvelimeen %1 portissa %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Muodostettu yhteys onnistuneesti kohteeseen %1: %2 versio %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Virhe: väärät tilitiedot.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Paikallinen kansio %1 on jo olemassa, asetetaan se synkronoitavaksi.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Luodaan paikallista synkronointikansiota %1... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>epäonnistui.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Paikalliskansion %1 luonti epäonnistui</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Yhteys %1iin osoitteessa %2 epäonnistui:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Etäkansiota ei määritelty!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Virhe: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>luodaan kansio ownCloudiin: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Etäkansio %1 luotiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Etäkansio %1 on jo olemassa. Otetaan siihen yhteyttä tiedostojen täsmäystä varten.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Kansion luonti aiheutti HTTP-virhekoodin %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Etäkansion luominen epäonnistui koska antamasi tunnus/salasana ei täsmää!<br/>Ole hyvä ja palaa tarkistamaan tunnus/salasana</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Pilvipalvelun etäkansion luominen ei onnistunut , koska tunnistautumistietosi ovat todennäköisesti väärin.</font><br/>Palaa takaisin ja tarkista käyttäjätunnus ja salasana.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Etäkansion %1 luonti epäonnistui, virhe <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Täsmäysyhteys kansiosta %1 etäkansioon %2 on asetettu.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Yhteys kohteeseen %1 muodostettiin onnistuneesti!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Yhteyttä osoitteeseen %1 ei voitu muodostaa. Ole hyvä ja tarkista uudelleen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
@@ -1246,22 +1251,27 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>Synkronointi peruttiin käyttäjän toimesta.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1269,7 +1279,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 2b5238e..e4acec9 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -601,7 +601,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Temps de connexion expiré</translation>
</message>
@@ -1079,126 +1084,126 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Echec du renommage du dossier</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Dossier de synchronisation local %1 créé avec succès !</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentative de connexion de %1 à %2 ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Connecté avec succès à %1: %2 version %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Erreur : paramètres de connexion invalides.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Le dossier de synchronisation local %1 existe déjà, configuration de la synchronisation.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Création du dossier de synchronisation local %1 …</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>échoué.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Impossible de créer le répertoire local %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Échec de la connexion à %1 pour %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Aucun dossier distant n'est spécifié !</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Erreur : %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>création d'un répertoire sur ownCloud : %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Le dossier distant %1 a été créé avec succès.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Le dossier distant %1 existe déjà. Veuillez vous y connecter pour la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La création du dossier a généré le code d'erreur HTTP %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>La création du répertoire distant a échoué car les identifiants de connexion sont erronés !<br/>Veuillez revenir en arrière et vérifier ces derniers.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">La création du dossier distant a échoué probablement parce que les informations d'identification fournies sont fausses.</font><br/>Veuillez revenir à l'étape précédente et vérifier vos informations d'identification.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>La création du dossier distant "%1" a échouée avec l'erreur <tt>%2</tt></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Une synchronisation entre le dossier local %1 et le dossier distant %2 a été configurée.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Connecté avec succès à %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>La connexion à %1 n'a pu être établie. Essayez encore svp.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Impossible de supprimer et de sauvegarder le dossier parce que ce dossier ou un de ces fichiers est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et cliquez sur ré-essayer ou annuler l'installation.</translation>
</message>
@@ -1250,22 +1255,27 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>File %1 ne peut pas être téléchargé en raison d'un conflit sur le nom du fichier local. </translation>
</message>
@@ -1273,7 +1283,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>File %1 ne peut pas être téléchargé en raison d'un conflit sur le nom du fichier local. </translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 8fad571..c5eb11f 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -601,7 +601,12 @@ Confirma que quere realizar esta operación?</translation>
<translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -1079,126 +1084,126 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Non foi posíbel renomear o cartafol</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>O cartafol local de sincronización %1 creouse correctamente!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentando conectarse a %1 en %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Conectouse correctamente a %1: %2 versión %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Erro: Credenciais incorrectas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>O cartafol de sincronización local %1 xa existe. Configurándoo para a sincronización.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Creando un cartafol local de sincronización %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>aceptar</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>fallou.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Non foi posíbel crear o cartafol local %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Non foi posíbel conectar con %1 en %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Non foi especificado o cartafol remoto!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Erro: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>creando o cartafol en ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>O cartafol remoto %1 creouse correctamente.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>O cartafol remoto %1 xa existe. Conectándoo para a sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A creación do cartafol resultou nun código de erro HTTP %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>A creación do cartafol remoto fracasou por por de seren incorrectas as credenciais!<br/>Volva atrás e comprobe as súas credenciais.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">A creación do cartafol remoto fallou probabelmente debido a que as credenciais que se deron non foran as correctas.</font><br/>Volva atrás e comprobe as súas credenciais.</p> </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Produciuse un fallo ao crear o cartafol remoto %1 e dou o erro <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Estabeleceuse a conexión de sincronización de %1 ao directorio remoto %2.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Conectou satisfactoriamente con %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Non foi posíbel estabelecer a conexión con %1. Compróbeo de novo.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Non é posíbel retirar e facer copia de seguranza do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e tenteo de novo, ou cancele a acción.</translation>
</message>
@@ -1250,22 +1255,27 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
@@ -1273,7 +1283,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index a9b7c22..6bb401b 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -598,7 +598,12 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1072,126 +1077,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>A mappa átnevezése nem sikerült</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Helyi %1 szinkronizációs mappa sikeresen létrehozva!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Próbál kapcsolódni az %1-hoz: %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Sikeresen csatlakozott az %1-hoz: %2 verziószám %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Hiba: rossz azonosítási adatok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>A helyi %1 mappa már létezik, állítsa be a szinkronizálódását.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Helyi %1 szinkronizációs mappa létrehozása...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation> sikertelen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Hiba: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>%1 távoli nappa sikeresen létrehozva.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>A %1 távoli mappa már létezik. Csatlakoztassa a szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A könyvtár létrehozásakor keletkezett HTTP hibakód %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">A távoli mappa létrehozása sikertelen, valószínűleg mivel hibásak a megdott hitelesítési adatok.</font><br/>Lépjen vissza és ellenőrizze a belépési adatokat.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>A távoli %1 mappa létrehozása nem sikerült. Hibaüzenet: <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>A szinkronizációs kapcsolat a %1 és a %2 távoli mappa között létrejött.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Sikeresen csatlakozva: %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>A kapcsolat a %1 kiszolgálóhoz sikertelen. Ellenőrizze újra.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
@@ -1243,22 +1248,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1266,7 +1276,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index ca34a1a..8e3573a 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -601,7 +601,12 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -1078,126 +1083,126 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Rinomina cartella non riuscita</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Cartella locale %1 creta correttamente!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentativo di connessione a %1 su %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Connesso correttamente a %1: %2 versione %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Errore: credenziali non valide.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>La cartella di sincronizzazione locale %1 esiste già, impostata per la sincronizzazione.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Creazione della cartella locale di sincronizzazione %1 in corso... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>non riuscita.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Impossibile creare la cartella locale %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Connessione a %1 su %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Nessuna cartella remota specificata!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Errore: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>creazione cartella su ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>La cartella remota %1 è stata creata correttamente.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>La cartella remota %1 esiste già. Connessione in corso per la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La creazione della cartella ha restituito un codice di errore HTTP %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>La creazione della cartella remota non è riuscita poiché le credenziali fornite sono errate!<br/>Torna indietro e verifica le credenziali.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">La creazione della cartella remota non è riuscita probabilmente perché le credenziali fornite non sono corrette.</font><br/>Torna indietro e controlla le credenziali inserite.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Creazione della cartella remota %1 non riuscita con errore <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Una connessione di sincronizzazione da %1 alla cartella remota %2 è stata stabilita.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Connessi con successo a %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>La connessione a %1 non può essere stabilita. Prova ancora.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperta in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione.</translation>
</message>
@@ -1249,22 +1254,27 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>Sincronizzazione interrotta dall'utente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation>
</message>
@@ -1272,7 +1282,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index c8bb291..e5eafda 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -601,7 +601,12 @@ Are you sure you want to perform this operation?</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -1077,126 +1082,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>フォルダー名の変更に失敗しました。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>ローカルの同期フォルダー %1 は正常に作成されました！</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>%2 の %1 へ接続を試みています...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">正常に %1 へ接続されました：%2 バージョン %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>エラー:資格情報が間違っています。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>ローカルの同期フォルダー %1 はすでに存在するため、同期の設定をしてください。<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>ローカルの同期フォルダー %1 を作成中... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>失敗。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>ローカルフォルダー %1 を作成できませんでした</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>%2 の %1 に接続に失敗:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>リモートフォルダーが指定されていません！</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>エラー: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>ownCloud上にフォルダーを作成中: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>リモートフォルダー %1 は正常に生成されました。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>リモートフォルダー %1 はすでに存在します。同期のために接続しています。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>フォルダーの作成はHTTPのエラーコード %1 で終了しました</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>指定された資格情報が間違っているため、リモートフォルダーの作成に失敗しました！<br/>前に戻って資格情報を確認してください。</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">おそらく資格情報が間違っているため、リモートフォルダーの作成に失敗しました。</font><br/>前に戻り、資格情報をチェックしてください。</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>リモートフォルダー %1 の作成がエラーで失敗しました。<tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>%1 からリモートディレクトリ %2 への同期接続を設定しました。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>%1への接続に成功しました！</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>%1 への接続を確立できませんでした。もう一度確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>フォルダーまたはその中にあるファイルが他のプログラムで開かれているため、フォルダーの削除やバックアップができません。フォルダーまたはファイルを閉じてから再試行するか、セットアップをキャンセルしてください。</translation>
</message>
@@ -1248,22 +1253,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>同期はユーザーによって中止されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation>
</message>
@@ -1271,7 +1281,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index d7e0f88..dbb770d 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -601,7 +601,12 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -1079,126 +1084,126 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Hernoemen map mislukt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokale synch map %1 is succesvol aangemaakt!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Probeer te verbinden met %1 om %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Succesvol verbonden met %1: %2 versie %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Fout: Verkeerde inloggegevens</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokale synch map %1 bestaat al, deze wordt ingesteld voor synchronisatie.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Maak lokale synchronisatiemap %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>mislukt.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Kon lokale map %1 niet aanmaken</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Kon geen verbinding maken met %1 op %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Geen externe map opgegeven!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Fout: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>aanmaken map op ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Externe map %1 succesvol gecreërd.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>De remote map %1 bestaat al. Verbinden voor synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Het aanmaken van de map resulteerde in HTTP foutcode %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.<br/>Ga terug en controleer uw inloggegevens.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.</font><br/>ga terug en controleer uw inloggevens.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Aanmaken van remote map %1 mislukt met fout <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Er is een sync verbinding van %1 naar remote directory %2 opgezet.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Succesvol verbonden met %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Verbinding met %1 niet geslaagd. Probeer het nog eens.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Kan de map niet verwijderen en backuppen, omdat de map of een bestand daarin, geopend is in een ander programma. Sluit de map of het bestand en drup op Opnieuw of annuleer de installatie.</translation>
</message>
@@ -1250,22 +1255,27 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>Synchronisatie afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden gedownload omdat de naam conflicteert met een lokaal bestand</translation>
</message>
@@ -1273,7 +1283,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden gedownload omdat de naam conflicteert met een lokaal bestand</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 9b97388..7f9fd60 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -601,7 +601,12 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -1079,126 +1084,126 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Zmiana nazwy folderu nie powiodła się</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Utworzenie lokalnego folderu synchronizowanego %1 zakończone pomyślnie!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Próba połączenia z %1 w %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Udane połączenie z %1: %2 wersja %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Błąd: złe poświadczenia.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokalny folder synchronizacji %1 już istnieje. Ustawiam go do synchronizacji.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Tworzenie lokalnego folderu synchronizowanego %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>Błąd.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Nie udało się utworzyć lokalnego folderu %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Nie udało się połączyć do %1 w %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Nie określono folderu zdalnego!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Błąd: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>tworzę folder na ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Zdalny folder %1 został utworzony pomyślnie.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Zdalny folder %1 już istnieje. Podłączam go do synchronizowania.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Tworzenie folderu spowodowało kod błędu HTTP %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Nie udało się utworzyć zdalnego folderu ponieważ podane dane dostępowe są nieprawidłowe!<br/>Wróć i sprawdź podane dane dostępowe.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Tworzenie folderu zdalnego nie powiodło się. Prawdopodobnie dostarczone poświadczenia są błędne.</font><br/>Wróć i sprawdź poświadczenia.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Tworzenie folderu zdalnego %1 nie powiodło się z powodu błędu <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Połączenie synchronizacji z %1 do katalogu zdalnego %2 zostało utworzone.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Udane połączenie z %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Połączenie z %1 nie może być nawiązane. Sprawdź ponownie.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Nie można usunąć i zarchiwizować folderu ponieważ znajdujący się w nim plik lub folder jest otwarty przez inny program. Proszę zamknąć folder lub plik albo kliknąć ponów lub anuluj setup.</translation>
</message>
@@ -1250,22 +1255,27 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>Synchronizacja anulowane przez użytkownika.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation>
</message>
@@ -1273,7 +1283,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 02debb4..4c597a2 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -600,7 +600,12 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<translation>Recebemos um e-Tag diferente para resumir. Tentando uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou </translation>
</message>
@@ -1076,126 +1081,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Erro ao renomear a pasta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>A tentar ligação a %1 em %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Conectado com sucesso a %1: %2 versão %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Erro: Credenciais erradas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>A pasta de sincronização locl %1 já existe, a configurar para sincronizar.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>A criar a pasta de sincronização local %1 ... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>Falhou.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Não foi possível criar a pasta local %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Impossível conectar a %1 em %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Não foi indicada a pasta remota!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Erro: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>a criar a pasta na ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Criação da pasta remota %1 com sucesso!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>A pasta remota %1 já existe. Ligue-a para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A criação da pasta resultou num erro HTTP com o código %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.<br/>Por favor, verifique as suas credenciais.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.</font><br/>Por favor, verifique as suas credenciais.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>A criação da pasta remota %1 falhou com o erro <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>A sincronização de %1 com a pasta remota %2 foi criada com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Conectado com sucesso a %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Não foi possível ligar a %1 . Por Favor verifique novamente.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Não é possível remover e fazer backup à pasta porque a pasta ou um ficheiro nesta está aberto em outro programa. Por favor, feche a pasta ou o ficheiro e clique novamente ou cancele a configuração.</translation>
</message>
@@ -1247,22 +1252,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhum E-Tag recebido do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <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. Tentando uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local!</translation>
</message>
@@ -1270,7 +1280,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local!</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 11cfde7..61c0579 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -601,7 +601,12 @@ Você tem certeza que quer executar esta operação?</translation>
<translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
@@ -1077,126 +1082,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Falha no nome da pasta</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentando conectar a %1 em %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Conectado com sucesso a %1: 2% versão %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Erro: Credenciais erradas.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Pasta local de sincronização %1 já existe, configurando para sincronização. <br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Criando pasta local de sincronização %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>falhou.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Não foi possível criar pasta local %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Falha ao conectar a %1 em %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Nenhuma pasta remota foi especificada!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Erro: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>criar pasta no ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Pasta remota %1 criada com sucesso.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Pasta remota %1 já existe. Conectando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A criação da pasta resultou em um erro do código HTTP %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>A criação da pasta remota falhou porque as credenciais fornecidas estão erradas!<br/>Por favor, volte e verifique suas credenciais.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">A criação remota de pasta falhou provavelmente as causas da falha na criação da pasta remota são credenciais erradas</font><br/>Volte e verifique suas credenciais, por favor.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Falha na criação da pasta remota %1 com erro <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Uma conexão de sincronização de %1 para o diretório remoto %2 foi realizada.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Conectado com sucesso a %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Conexão à %1 não foi estabelecida. Por favor, verifique novamente.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo que está nesta pasta está aberto em outro programa. Por favor, feche a pasta ou arquivo e clique tentar novamente ou cancelar a operação.</translation>
</message>
@@ -1248,22 +1253,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser baixado por causa de um confronto local no nome do arquivo!</translation>
</message>
@@ -1271,7 +1281,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser baixado por causa de um confronto local no nome do arquivo!</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 04a55c5..b666cf3 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -183,13 +183,14 @@
<location filename="../src/mirall/accountsettings.cpp" line="602"/>
<source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s"</extracomment>
- <translation type="unfinished"/>
+ <translation>%1 %2 (%3 / %4) Осталось %5 на скорости %6/сек.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="617"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
- <translation type="unfinished"/>
+ <translation>%1 / %2, файл %3 / %4
+Оставшееся время: %5</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="739"/>
@@ -507,7 +508,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="139"/>
<source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source>
- <translation type="unfinished"/>
+ <translation>Выбранная папка является симолической ссылкой. В папке, на которую идет ссылка, присутствует папка, которая синхронизируется.</translation>
</message>
<message>
<location filename="../src/mirall/folderwizard.cpp" line="146"/>
@@ -600,7 +601,12 @@ Are you sure you want to perform this operation?</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Тайм-аут подключения</translation>
</message>
@@ -615,7 +621,7 @@ Are you sure you want to perform this operation?</source>
<message>
<location filename="../src/mirall/generalsettings.ui" line="20"/>
<source>General Settings</source>
- <translation type="unfinished"/>
+ <translation>Основные настройки</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -800,7 +806,7 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/updater/ocupdater.cpp" line="258"/>
<source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
- <translation type="unfinished"/>
+ <translation><p>Доступна новая версия приложения %1.</p><p><b>%2</b> доступна для загрузки. Установленная версия: %3.</p></translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="271"/>
@@ -956,7 +962,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="85"/>
<source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation type="unfinished"/>
+ <translation>Доступна новая версия %1. Чтобы его установить, пожалуйста, воспользуйтесь инструментом обновления системы.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="87"/>
@@ -1078,128 +1084,128 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Ошибка переименования папки</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Локальная папка для синхронизации %1 успешно создана!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Попытка соединиться с %1 на %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Успешно подключено к %1: %2 версия %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Ошибка: Неверные учётные данные.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Локальная синхронизация папки %1 уже существует, ее настройки для синхронизации.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Создание локальной папки синхронизации %1... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ок</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>не удалось.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Не удалось создать локальную папку синхронизации %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Не удалось подключиться к %1 в %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Не указана удалённая папка!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Ошибка: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>создание папки на ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Удалённая папка %1 успешно создана.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Удалённая папка %1 уже существует. Подключение к ней для синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Создание папки завершилось с HTTP-ошибкой %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Не удалось создать удаленную папку — представленные параметры доступа неверны!<br/>Пожалуйста, вернитесь назад и проверьте параметры доступа.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Удаленное создание папки не удалось, вероятно, потому, что предоставленные учетные данные неверны.</font><br/>Пожалуйста, вернитесь назад и проверьте данные.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Удаленная папка %1 не создана из-за ошибки <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Установлено соединение синхронизации с %1 к удалённой директории %2.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Соединение с %1 установлено успешно!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Подключение к %1 не воможно. Пожалуйста, проверьте еще раз.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
- <translation type="unfinished"/>
+ <translation>Невозможно стереть папку и создать её резервную копию так как папка или файл в ней открыты в другой программе. Пожалуйста, закройте папку или файл и нажмите "Повторите попытку", либо прервите мастер настройки.</translation>
</message>
</context>
<context>
@@ -1249,32 +1255,37 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>Синхронизация прервана пользователем.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <translation>Файл %1 не может быть загружен из-за локальных конфликтов имен!</translation>
+ </message>
</context>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation type="unfinished"/>
+ <translation>Файл %1 не может быть загружен из-за локальных конфликтов имен!</translation>
</message>
</context>
<context>
@@ -1282,7 +1293,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="51"/>
<source>; Restoration Failed: </source>
- <translation type="unfinished"/>
+ <translation>; Восстановление не удалось:</translation>
</message>
<message>
<location filename="../src/mirall/owncloudpropagator.cpp" line="170"/>
@@ -1295,7 +1306,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="113"/>
<source>Attention, possible case sensitivity clash with %1</source>
- <translation type="unfinished"/>
+ <translation>Внимание, возможен конфликт чувствительности к регистру с %1</translation>
</message>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="118"/>
@@ -1308,7 +1319,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="80"/>
<source>Could not remove %1 because of a local file name clash</source>
- <translation type="unfinished"/>
+ <translation>Файл %1 не может быть удален из-за локальных конфликтов имен</translation>
</message>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="87"/>
@@ -1321,7 +1332,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="234"/>
<source>File %1 can not be renamed to %2 because of a local file name clash</source>
- <translation type="unfinished"/>
+ <translation>Файл %1 не может быть переименован в %2 из-за локальных конфликтов имен</translation>
</message>
</context>
<context>
@@ -1347,7 +1358,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagatorjobs.cpp" line="288"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
- <translation>Этот файл был переименован но является частью распространения только для чтения. Оригинальный файл был восстановлен.</translation>
+ <translation>Этот файл был переименован но является частью опубликованной папки с правами только для чтения. Оригинальный файл был восстановлен.</translation>
</message>
</context>
<context>
@@ -1366,7 +1377,7 @@ It is not advisable to use it.</source>
<message>
<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>Этот файл был изменен локально, но является частью опубликованной папки с правами только для чтения. Он восстановлен и ваши изменения находятся в файле конфликтов.</translation>
</message>
</context>
<context>
@@ -1374,7 +1385,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="274"/>
<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>Этот файл был изменен локально, но является частью опубликованной папки с правами только для чтения. Он восстановлен и ваши изменения находятся в файле конфликтов.</translation>
</message>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="303"/>
@@ -1389,7 +1400,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/propagator_qnam.cpp" line="320"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation type="unfinished"/>
+ <translation>Сервер не смог подтвердить последний отрезок данных. (Отсутствовали теги e-tag)</translation>
</message>
</context>
<context>
@@ -1543,7 +1554,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="288"/>
<source>Login Error</source>
- <translation type="unfinished"/>
+ <translation>Ошибка входа</translation>
</message>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="288"/>
@@ -1561,12 +1572,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="61"/>
<source>Reauthentication required</source>
- <translation type="unfinished"/>
+ <translation>Требуется повторная аутентификация</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="61"/>
<source>Your session has expired. You need to re-login to continue to use the client.</source>
- <translation type="unfinished"/>
+ <translation>Срок действия вашей сессии истек. Нужно перезайти, чтобы продолжить пользоваться приложением.</translation>
</message>
<message>
<location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="108"/>
@@ -1880,7 +1891,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/syncengine.cpp" line="149"/>
<source>A network connection timeout happened.</source>
- <translation type="unfinished"/>
+ <translation>Произошёл таймаут соединения сети.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="152"/>
@@ -1956,38 +1967,38 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/syncengine.cpp" line="728"/>
<source>Not allowed because you don't have permission to add sub-directories in that directory</source>
- <translation type="unfinished"/>
+ <translation>Недопустимо из-за отсутствия у вас разрешений на добавление подпапок в этой папке</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="735"/>
<source>Not allowed because you don't have permission to add parent directory</source>
- <translation type="unfinished"/>
+ <translation>Недопустимо из-за отсутствия у вас разрешений на добавление родительской папки</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="742"/>
<source>Not allowed because you don't have permission to add files in that directory</source>
- <translation type="unfinished"/>
+ <translation>Недопустимо из-за отсутствия у вас разрешений на добавление файлов в эту папку</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="760"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
- <translation type="unfinished"/>
+ <translation>Недопустимо отправить этот файл поскольку на севрере он помечен только для чтения, восстанавливаем</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="775"/>
<location filename="../src/mirall/syncengine.cpp" line="795"/>
<source>Not allowed to remove, restoring</source>
- <translation type="unfinished"/>
+ <translation>Недопустимо удалить, восстанавливаем</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="845"/>
<source>Move not allowed, item restored</source>
- <translation type="unfinished"/>
+ <translation>Перемещение недопустимо, элемент восстановлен</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="854"/>
<source>Move not allowed because %1 is read-only</source>
- <translation type="unfinished"/>
+ <translation>Перемещение недопустимо, поскольку %1 помечен только для чтения</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="855"/>
@@ -2026,7 +2037,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="180"/>
<source>Disconnected from server</source>
- <translation type="unfinished"/>
+ <translation>Отсоединен от сервера</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="212"/>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index b5988dd..923c737 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -600,7 +600,12 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Spojenie vypršalo</translation>
</message>
@@ -1078,126 +1083,126 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Premenovanie priečinka zlyhalo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokálny synchronizačný priečinok %1 bol úspešne vytvorený!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Pokúšam sa o pripojenie k %1 na %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Úspešne pripojené k %1: %2 verzie %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Chyba: Nesprávne údaje.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokálny synchronizačný priečinok %1 už existuje, prebieha jeho nastavovanie pre synchronizáciu.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Vytváranie lokálneho synchronizačného priečinka %1 ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>v poriadku</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>neúspešné.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Nemožno vytvoriť lokálny priečinok %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Zlyhalo spojenie s %1 o %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Vzdialený priečinok nie je nastavený!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Chyba: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>vytváram priečinok v ownCloude: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Vzdialený priečinok %1 bol úspešne vytvorený.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Vzdialený priečinok %1 už existuje. Prebieha jeho pripájanie pre synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Vytváranie priečinka skončilo s HTTP chybovým kódom %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Proces vytvárania vzdialeného priečinka zlyhal, lebo použité prihlasovacie údaje nie sú správne!<br/>Prosím skontrolujte si vaše údaje a skúste to znovu.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Vytvorenie vzdialeného priečinka pravdepodobne zlyhalo kvôli nesprávnym prihlasovacím údajom.</font><br/>Prosím choďte späť a skontrolujte ich.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Vytvorenie vzdialeného priečinka %1 zlyhalo s chybou <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Synchronizačné spojenie z %1 do vzdialeného priečinka %2 bolo práve nastavené.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Úspešne pripojené s %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Pripojenie k %1 nemohlo byť iniciované. Prosím skontrolujte to znovu.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Nemožno odstrániť a zazálohovať priečinok, pretože priečinok alebo súbor je otvorený v inom programe. Prosím zatvorte priečinok nebo súbor a skúste to znovu alebo zrušte akciu.</translation>
</message>
@@ -1249,22 +1254,27 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation>
</message>
@@ -1272,7 +1282,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index b19178e..50f3465 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -600,7 +600,12 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Povezava časovno pretekla</translation>
</message>
@@ -1078,126 +1083,126 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Preimenovanje mape je spodletelo</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Krajevno usklajena mapa %1 je uspešno ustvarjena!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Poteka poskus povezave z %1 na %2 ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Uspešno vzpostavljena povezava z %1: %2 različica %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Napaka: napačna poverila.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Krajevna mapa %1 že obstaja. Nastavljena bo za usklajevanje.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Ustvarjanje mape za krajevno usklajevanje %1... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>je v redu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>je spodletelo.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Krajevne mape %1 ni mogoče ustvariti.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Povezava z %1 pri %2 je spodletela:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Ni navedenega oddaljenega strežnika!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Napaka: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>ustvarjanje mape v oblaku ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Oddaljena mapa %1 je uspešno ustvarjena.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Oddaljena mapa %1 že obstaja. Vzpostavljena bo povezava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Ustvarjanje mape je povzročilo napako HTTP %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Ustvarjanje mape na oddaljenem naslovu je spodletelo zaradi napačnih poveril. <br/>Vrnite se in preverite zahtevana gesla.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Ustvarjanje oddaljene mape je spodletelo. Najverjetneje je vzrok v neustreznih poverilih.</font><br/>Vrnite se na predhodno stran in jih preverite.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Ustvarjanje oddaljene mape %1 je spodletelo z napako <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Povezava za usklajevanje med %1 in oddaljeno mapo %2 je vzpostavljena.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Povezava z %1 je uspešno vzpostavljena!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Povezave z %1 ni mogoče vzpostaviti. Preveriti je treba nastavitve.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, saj je mapa oziroma dokument v njej odprt v z drugim programom. Zaprite mapo/dokument ali prekinite namestitev.</translation>
</message>
@@ -1249,22 +1254,27 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Datoteke %1 ni možno prejeti, zaradi neskladja z imenom krajevne datoteke!</translation>
</message>
@@ -1272,7 +1282,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index de5b24f..f2e770f 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -601,7 +601,12 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<translation>Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -1079,126 +1084,126 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Omdöpning av mapp misslyckades</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokal synkmapp %1 skapad!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Försöker ansluta till %1 på %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Lyckades ansluta till %1: %2 version %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Fel: Ogiltiga inloggningsuppgifter.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokal synkmapp %1 finns redan, aktiverar den för synk.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Skapar lokal synkmapp %1... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>misslyckades.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Kunde inte skapa lokal mapp %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Misslyckades att ansluta till %1 vid %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Ingen fjärrmapp specificerad! </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Fel: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>skapar mapp på ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Fjärrmapp %1 har skapats.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Fjärrmappen %1 finns redan. Ansluter den för synkronisering.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Skapande av mapp resulterade i HTTP felkod %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Det gick inte att skapa mappen efter som du inte har tillräckliga rättigheter!<br/>Vänligen återvänd och kontrollera dina rättigheter.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Misslyckades skapa fjärrmappen, troligen p.g.a felaktiga inloggningsuppgifter.</font><br/>Kontrollera dina inloggningsuppgifter.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Misslyckades skapa fjärrmapp %1 med fel <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>En synkroniseringsanslutning från %1 till fjärrmappen %2 har skapats.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Ansluten till %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Anslutningen till %1 kunde inte etableras. Var god kontrollera och försök igen.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Kan inte ta bort och göra en säkerhetskopia av mappen på grund av att mappen eller en fil i den används av ett annat program. Vänligen stäng mappen eller filen och försök igen eller avbryt installationen.</translation>
</message>
@@ -1250,22 +1255,27 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>Synkningen avbröts av användare.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ingen E-Tag mottogs från servern, kontrollera proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="405"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Vi mottog en helt annan E-Tag för att återuppta. Försöker igen nästa gång.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil!</translation>
</message>
@@ -1273,7 +1283,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil!</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index ee605ec..248c401 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -598,7 +598,12 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1072,126 +1077,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>โฟลเดอร์ภายในเครื่องสำหรับผสานข้อมูล %1 ได้ถูกสร้างขึ้นเรียบร้อยแล้ว!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>กำลังพยายามเชื่อมต่อไปที่ %1 ที่ %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">เชื่อมต่อกับ %1: %2 รุ่น %3 (%4) เสร็จเรียบร้อยแล้ว</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>โฟลเดอร์สำหรับถ่ายโอนข้อมูลภายในเครื่อง %1 มีอยู่แล้ว กรุณาตั้งค่าเพื่อถ่ายข้อมูล <br/<br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>กำลังสร้างโฟลเดอร์สำหรับโอนถ่ายข้อมูลภายในเครื่อง %1 ...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ตกลง</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>ข้อผิดพลาด: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>กำลังสร้างโฟลเดอร์ใหม่บน ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>โฟลเดอร์ระยะไกล %1 ถูกสร้างเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>โฟลเดอร์ระยะไกล %1 มีอยู่แล้ว กำลังเชื่อมต่อเพื่อถ่ายโอนข้อมูล</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>การสร้างโฟลเดอร์ดังกล่าวส่งผลให้เกิดรหัสข้อผิดพลาด HTTP error code %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">การสร้างโฟลเดอร์ระยะไกลล้มเหลว ซึ่งอาจมีสาเหตุมาจากการกรอกข้อมูลส่วนตัวเพื่อเข้าใช้งานไม่ถูกต้อง.</font><br/>กรุณาย้อนกลับไปแล้วตรวจสอบข้อมูลส่วนตัวของคุณอีกครั้ง.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>การสร้างโฟลเดอร์ระยะไกล %1 ล้มเหลวเนื่องข้อผิดพลาด <tt>%2</tt></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>การเชื่อมต่อเผื่อผสานข้อมูลจาก %1 ไปที่ไดเร็กทอรี่ระยะไกล %2 ได้ถูกติดตั้งแล้ว</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>เชื่อมต่อไปที่ %1! สำเร็จ</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>การเชื่อมต่อกับ %1 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
@@ -1243,22 +1248,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1266,7 +1276,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index ef7bc37..e6d1f0d 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -601,7 +601,12 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<translation>Devam etmek üzere farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>Bağlantı Zaman Aşımı</translation>
</message>
@@ -1079,126 +1084,126 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Klasör adlandırma başarısız</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Yerel eşitleme klasörü %1 başarıyla oluşturuldu!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>%2 üzerinde %1 bağlantısı deneniyor...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">%1 bağlantısı başarılı: %2 sürüm %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>Hata: Hatalı kimlik bilgileri.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Yerel eşitleme klasörü %1 zaten mevcut, eşitlemek için ayarlanıyor.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Yerel eşitleme klasörü %1 oluşturuluyor...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>tamam</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>başarısız.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>%1 yerel klasörü oluşturulamadı</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>%2 üzerinde %1 bağlantısı yapılamadı:<br/>%3</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation>Uzak klasör belirtilmemiş!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Hata: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>ownCloud üzerinde klasör oluşturuluyor: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>%1 uzak klasörü başarıyla oluşturuldu.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Uzak klasör %1 zaten mevcut. Eşitlemek için bağlanılıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Klasör oluşturma %1 HTTP hata kodu ile sonuçlandı</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Uzak klasör oluşturması, geçersiz kimlik bilgileri nedeniyle başarısız!<br/>Lütfen geri gidin ve bilgileri denetleyin.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Uzak klasör oluşturma muhtemelen hatalı kimlik bilgilerinden dolayı başarısız oldu.</font><br/>Lütfen geri gidip kimlik bilgilerini doğrulayın.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Uzak klasör %1 oluşturma işlemi <tt>%2</tt> hatası ile başarısız oldu.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>%1 kaynaklı %2 uzak dizinine bir eşitleme bağlantısı ayarlandı.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>%1 bağlantısı başarılı!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>%1 bağlantısı kurulamadı. Lütfen tekrar denetleyin.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Klasör veya içerisindeki bir dosya farklı bir program içerisinde açık olduğundan, kaldırma ve yedekleme işlemi yapılamıyor. Lütfen klasör veya dosyayı kapatıp yeniden deneyin veya kurulumu iptal edin.</translation>
</message>
@@ -1250,22 +1255,27 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<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="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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 aldık. Sonraki işlemde yeniden denenecek.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor!</translation>
</message>
@@ -1273,7 +1283,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor!</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index c8ea419..546d114 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -600,7 +600,12 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1074,126 +1079,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>Не вдалося перейменувати теку</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Локальна тека синхронізації %1 успішно створена!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Спроба підключення до %1 на %2...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Успішно підключено до %1: %2 версія %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Локальна тека синхронізації %1 вже існує, налаштування її для синхронізації.<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>Створення локальної теки для синхронізації %1... </translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>не вдалося.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>Не вдалося створити локальну теку $1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>Помилка: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>створення теки на ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>Віддалена тека %1 успішно створена.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Віддалена тека %1 вже існує. Під'єднання для синхронізації.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Створення теки завершилось HTTP помилкою %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Створити віддалену теку не вдалося через невірно вказані облікові дані.<br/>Поверніться назад та перевірте облікові дані.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Створити віддалену теку не вдалося, можливо, через невірно вказані облікові дані.</font><br/>Будь ласка, поверніться назад та перевірте облікові дані.</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Не вдалося створити віддалену теку %1 через помилку <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>З'єднання для синхронізації %1 з віддаленою текою %2 було встановлено.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>Успішно під'єднано до %1!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Підключення до %1 встановити не вдалося. Будь ласка, перевірте ще раз.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
@@ -1245,22 +1250,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1268,7 +1278,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index 23030f3..204d5f5 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -600,7 +600,12 @@ Are you sure you want to perform this operation?</source>
<translation>我们收到了不同的恢复 E-Tag，将在下次尝试。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -1076,126 +1081,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>文件夹更名失败</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>本地同步目录 %1 已成功创建</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>尝试连接位于 %2 的 %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">成功连接到 %1：%2 版本 %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>错误：密码错误。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>本地同步文件夹 %1 已存在，将使用它来同步。<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>正在创建本地同步文件夹 %1...</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>成功</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>失败</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>不能创建本地文件夹 %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>错误：%1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>在 ownCloud 创建文件夹：%1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>远程目录%1成功创建。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>远程文件夹 %1 已存在。连接它以供同步。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>创建文件夹出现 HTTP 错误代码 %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>远程文件夹创建失败，因为提供的凭证有误！<br/>请返回并检查您的凭证。</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">远程文件夹创建失败，可能是由于提供的用户名密码不正确。</font><br/>请返回并检查它们。</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>创建远程文件夹 %1 失败，错误为 <tt>%2</tt>。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>已经设置了一个 %1 到远程文件夹 %2 的同步连接</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>成功连接到了 %1！</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>无法建立到 %1的链接，请稍后重试</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
@@ -1247,22 +1252,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation>同步被用户撤销。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<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="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1270,7 +1280,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 48454e4..1608aef 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -598,7 +598,12 @@ Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="503"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="531"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1072,126 +1077,126 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::OwncloudSetupWizard</name>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="360"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="369"/>
<source>Folder rename failed</source>
<translation>重新命名資料夾失敗</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="415"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="424"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="440"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>本地同步資料夾 %1 建立成功!</b></font></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="193"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="202"/>
<source>Trying to connect to %1 at %2...</source>
<translation>嘗試連線到%1從%2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="149"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="158"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">成功連線到 %1: %2 版本 %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="218"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="227"/>
<source>Error: Wrong credentials.</source>
<translation>錯誤: 錯誤的憑證。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="232"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="241"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>本地同步資料夾%1已存在, 將其設置為同步<br/><br/></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="234"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="243"/>
<source>Creating local sync folder %1... </source>
<translation>建立本地同步資料夾 %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="238"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="247"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="240"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="249"/>
<source>failed.</source>
<translation>失敗</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="242"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="251"/>
<source>Could not create local folder %1</source>
<translation>無法建立本地資料夾 %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="173"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="182"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="190"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="267"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="276"/>
<source>No remote folder specified!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="273"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
<source>Error: %1</source>
<translation>錯誤： %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="286"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="295"/>
<source>creating folder on ownCloud: %1</source>
<translation>在 ownCloud 建立資料夾： %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="302"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="311"/>
<source>Remote folder %1 created successfully.</source>
<translation>遠端資料夾%1建立成功!</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="304"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>遠端資料夾%1已存在,連線同步中</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="306"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="308"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="317"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>在HTTP建立資料夾失敗, error code %1</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="310"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>由於帳號或密碼錯誤，遠端資料夾建立失敗<br/>請檢查您的帳號密碼。</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="322"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">遠端資料夾建立失敗,也許是因為所提供的帳號密碼錯誤</font><br/>請重新檢查您的帳號密碼</p></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="318"/>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="319"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="327"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>建立遠端資料夾%1發生錯誤<tt>%2</tt>失敗</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="335"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="344"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>從%1到遠端資料夾%2的連線已建立</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="340"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="349"/>
<source>Successfully connected to %1!</source>
<translation>成功連接到 %1 ！</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="347"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="356"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>無法建立連線%1, 請重新檢查</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudsetupwizard.cpp" line="361"/>
+ <location filename="../src/mirall/owncloudsetupwizard.cpp" line="370"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
@@ -1243,22 +1248,27 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="345"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="344"/>
<source>Sync was aborted by user.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="400"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="399"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="410"/>
+ <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>
<message>
- <location filename="../src/mirall/propagator_legacy.cpp" line="454"/>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="427"/>
+ <source>Server returned wrong content-range</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_legacy.cpp" line="478"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1266,7 +1276,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="517"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="545"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list