[Pkg-owncloud-commits] [owncloud-client] 95/332: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Aug 14 21:06:44 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 08398784e41c72ccfcc9e0c314b4cbf36ee3e724
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Tue Jun 17 01:25:29 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 93 ++++++++++++++++++---------------
translations/mirall_cs.ts | 95 +++++++++++++++++++---------------
translations/mirall_de.ts | 95 +++++++++++++++++++---------------
translations/mirall_el.ts | 95 +++++++++++++++++++---------------
translations/mirall_en.ts | 89 ++++++++++++++++++--------------
translations/mirall_es.ts | 95 +++++++++++++++++++---------------
translations/mirall_es_AR.ts | 93 ++++++++++++++++++---------------
translations/mirall_et.ts | 95 +++++++++++++++++++---------------
translations/mirall_eu.ts | 91 ++++++++++++++++++---------------
translations/mirall_fa.ts | 89 ++++++++++++++++++--------------
translations/mirall_fi.ts | 95 +++++++++++++++++++---------------
translations/mirall_fr.ts | 95 +++++++++++++++++++---------------
translations/mirall_gl.ts | 95 +++++++++++++++++++---------------
translations/mirall_hu.ts | 89 ++++++++++++++++++--------------
translations/mirall_it.ts | 95 +++++++++++++++++++---------------
translations/mirall_ja.ts | 95 +++++++++++++++++++---------------
translations/mirall_nl.ts | 95 +++++++++++++++++++---------------
translations/mirall_pl.ts | 95 +++++++++++++++++++---------------
translations/mirall_pt.ts | 95 +++++++++++++++++++---------------
translations/mirall_pt_BR.ts | 95 +++++++++++++++++++---------------
translations/mirall_ru.ts | 93 ++++++++++++++++++---------------
translations/mirall_sk.ts | 119 +++++++++++++++++++++++--------------------
translations/mirall_sl.ts | 95 +++++++++++++++++++---------------
translations/mirall_sv.ts | 95 +++++++++++++++++++---------------
translations/mirall_th.ts | 89 ++++++++++++++++++--------------
translations/mirall_tr.ts | 95 +++++++++++++++++++---------------
translations/mirall_uk.ts | 89 ++++++++++++++++++--------------
translations/mirall_zh_CN.ts | 91 ++++++++++++++++++---------------
translations/mirall_zh_TW.ts | 91 ++++++++++++++++++---------------
29 files changed, 1525 insertions(+), 1206 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 5235d97..267579b 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -144,29 +144,23 @@
<translation><p>Voleu reiniciar la carpeta <i>%1</i> i reconstruir la base de dades del client?</p><p><b>Nota:</b> Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s'eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l'administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>S'està sincronitzant.<br/>Voleu parar-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Connectat a <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 de %2, fitxer %3 de %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Connectat a <a href="%1">%2</a>.</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connectat a <a href="%1">%2</a> com a <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Aquesta sincronització eliminarà tots els fitxers a la carpeta local de sincronització '%1'.
Si vós o l'administrador heu reinicialitzat el compte en el servidor, escolliu "Mantenir fitxers". Si voleueliminar les dades, escolliu "Esborra tots els fitxers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -596,17 +597,17 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1278,7 +1279,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1373,17 +1374,22 @@ No és aconsellada usar-la.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>El fitxer local ha canviat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1565,7 +1571,7 @@ Proveu de sincronitzar-los de nou.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ Proveu de sincronitzar-los de nou.</translation>
<translation>S'ha produït l'error intern número %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>L'element no s'ha sincronitzat degut a errors previs: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>La sincronització d'enllaços simbòlics no està implementada.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>El fitxer està a la llista d'ignorats.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>No es pot obrir el diari de sincronització</translation>
</message>
@@ -2074,17 +2080,22 @@ Proveu de sincronitzar-los de nou.</translation>
<translation>No hi ha elements sincronitzats recentment</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Actualitzat</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 17763b1..c8512b3 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -144,29 +144,23 @@
<translation><p>Skutečně chcete resetovat složku <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 ze %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 místa na disku použito.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Žádné spojení s %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Připojeno k <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 z %2, soubor %3 z %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Připojeno k <a href="%1">%2</a>.</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Připojeno k <a href="%1">%2</a> jako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Momentálně nejsou k dispozici žádné informace o využití úložiště</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Tato synchronizace by smazala všechny soubory v místní složce '%1'
Pokud jste vy nebo váš správce zresetovali účet na serveru, zvolte "Ponechat soubory". Pokud chcete místní data odstranit, zvolte "Odstranit všechny soubory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -596,17 +597,17 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Spojení Vypršelo</translation>
</message>
@@ -1278,7 +1279,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1373,17 +1374,22 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Místní soubor byl změněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1566,7 +1572,7 @@ Zkuste provést novou synchronizaci.
<translation>Vaše sezení vypršelo. Chcete-li pokračovat v práci musíte se znovu přihlásit.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1921,32 +1927,32 @@ Zkuste provést novou synchronizaci.
<translation>Nastala vnitřní chyba číslo %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Položka nebyla synchronizována kvůli předchozí chybě: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Soubor se nachází na seznamu ignorovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Nelze otevřít synchronizační žurnál</translation>
</message>
@@ -2075,17 +2081,22 @@ Zkuste provést novou synchronizaci.
<translation>Žádné položky nebyly nedávno synchronizovány</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Synchronizace %1 z %2 (%3 z %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index f97e6b5..9774331 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -145,29 +145,23 @@
Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Umfang des Ordners mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn ihr Administrator dies ausdrücklich wünscht.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 von %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) von %2 Serverkapazität in Benutzung.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Keine Verbindung mit %1 zu <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
@@ -187,22 +181,29 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Verbunden mit <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 of %2, Datei %3 von %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Verbunden mit <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Verbunden mit <a href="%1">%2</a> als <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
@@ -347,14 +348,14 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Dieser Synchronisationsvorgang würde alle Dateien in dem lokalen Ordner '%1' entfernen.
Wenn Sie oder Ihr Administrator Ihr Konto auf dem Server zurückgesetzt haben, wählen Sie "Dateien behalten". Wenn Sie ihre Daten löschen wollen, wählen Sie "Alle Dateien entfernen".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -363,17 +364,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -597,17 +598,17 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
@@ -1279,7 +1280,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1374,17 +1375,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
</message>
@@ -1566,7 +1572,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>Ihre Sitzung ist abgelaufen. Sie müssen sich zur weiteren Nutzung des Clients neu Anmelden.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1921,32 +1927,32 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>Interne Fehlernummer %1 aufgetreten.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Die Datei ist in der Ignorierliste geführt.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
@@ -2075,17 +2081,22 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>Keine kürzlich synchronisierten Elemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Synchronisiere %1 von %2 (%3 von %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Aktuell</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index b0665a3..e09f746 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -144,29 +144,23 @@
<translation><p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του πελάτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 από %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>Χρησιμοποιούμενος χώρος στον διακομιστή: %1 (%3%) από %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Δεν υπάρχει σύνδεση με %1 στο <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Δεν υπάρχει σύνδεση με το %1.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Συνδεδεμένοι με <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 από %2, αρχείο %3 από %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Συνδεδεμένοι με <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a> ως <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Αυτός ο συγχρονισμός θα αφαιρέσει όλα τα αρχεία στον τοπικό φάκελο συγχρονισμού '%1'.
Εάν εσείς ή ο διαχειριστής σας επαναφέρατε τον λογαριασμό σας στο διακομιστή, επιλέξτε "Διατήρηση αρχείων". Εάν θέλετε να αφαιρεθούν τα δεδομένα σας, επιλέξτε "Αφαίρεση όλων των αρχείων".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -596,17 +597,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Δεν ελήφθη E-Tag από τον διακομιστή, ελέγξτε τον διακομιστή μεσολάβησης/πύλη</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Χρονικό όριο σύνδεσης</translation>
</message>
@@ -1278,7 +1279,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να μεταφορτωθεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
</message>
@@ -1373,17 +1374,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και η επεξεργασία σας βρίσκεται στο αρχείο συγκρούσεων.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Ο διακομιστής δεν επιβεβαίωσε το τελευταίο τμήμα. (Δεν υπήρχε E-Tag)</translation>
</message>
@@ -1565,7 +1571,7 @@ It is not advisable to use it.</source>
<translation>Η συνεδρία σας έληξε. Πρέπει να εισέλθετε ξανά για να συνεχίσετε να χρησιμοποιείτε το πρόγραμμα.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ It is not advisable to use it.</source>
<translation>Συνέβη εσωτερικό σφάλμα με αριθμό %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Αποτυχία ανοίγματος του ημερολογίου συγχρονισμού.</translation>
</message>
@@ -2074,17 +2080,22 @@ It is not advisable to use it.</source>
<translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Συγχρονισμός %1 από %2 (%3 από %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Ενημερωμένο</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index a83c992..195ffff 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -146,29 +146,23 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
@@ -188,22 +182,29 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
@@ -348,30 +349,30 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -595,17 +596,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -1273,7 +1274,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
@@ -1368,17 +1369,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
@@ -1559,7 +1565,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation type="unfinished"></translation>
</message>
@@ -1912,32 +1918,32 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
@@ -2066,17 +2072,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index b318916..64d2dcd 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -144,29 +144,23 @@
<translation><p>Realmente desea restablecer la carpeta <i>%1</i> y reconstruir la base de datos de cliente?</p><p><b>Nota:</b> Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 de %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 espacio usado en el servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>No hay conexión a %1 en <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Conectado a <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 de %2, archivo %3 de %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización eliminaría todos los archivos en la carpeta local de sincronización '%1'.
Si ud. o su administrador han restablecido su cuenta en el servidor, elija "Conservar Archivos". Si desea eliminar toda su información, elija "Eliminar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -596,17 +597,17 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió ninguna e-tag del servidor, revisar el proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
@@ -1278,7 +1279,7 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1373,17 +1374,22 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Un archivo local fue modificado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>El servidor no reconoció la última parte. (No había una e-tag presente.)</translation>
</message>
@@ -1565,7 +1571,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>Su sesión ha caducado. Necesita volver a iniciarla para continuar usando el cliente.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>Ha ocurrido un error interno número %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>El elemento no está sincronizado por errores previos: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Los enlaces simbolicos no estan sopertados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>El fichero está en la lista de ignorados</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>No es posible abrir el diario de sincronización</translation>
</message>
@@ -2074,17 +2080,22 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>No se han sincronizado elementos recientemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Sincronizando %1 de %2 (%3 de %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 6cea18e..10faf47 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -144,29 +144,23 @@
<translation><p>¿Realmente deseas resetear el directorio <i>%1</i> y reconstruir la base de datos del cliente?</p><p><b>Nota:</b> Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.</p>< [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Conectado a <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 de %2, archivo %3 de %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Conectado a <a href="%1">%2</a>.</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización borraría todos los archivos en la carpeta local de sincronización '%1'.
Si vos o el administrador resetearon tu cuenta en el servidor, elegí "Conservar Archivos". Si querés borrar toda tu información, elegí "Borrar todos los archivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -596,17 +597,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1276,7 +1277,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1371,17 +1372,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1563,7 +1569,7 @@ Intente sincronizar estos nuevamente.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1916,32 +1922,32 @@ Intente sincronizar estos nuevamente.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Los vínculos simbólicos no está soportados al sincronizar.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>El archivo está en la lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Imposible inicializar un diario de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
@@ -2070,17 +2076,22 @@ Intente sincronizar estos nuevamente.</translation>
<translation>No se sincronizaron elementos recientemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>actualizado</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 019e5f9..3637df7 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -144,29 +144,23 @@
<translation><p>Kas tõesti soovid kataloogi <i>%1</i> algseadistada ning uuesti luua oma kliendi andmebaasi?</p><p><b>See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:</b>Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 / %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) %2-st serveri mahust on kasutuses.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Ühendus puudub %1 <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Ühendatud <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 / %2, fail %3 / %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Ühendatud <a href="%1">%2</a>.</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Ühendatud <a href="%1">%2</a> kui <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Hetkel pole mahu kasutuse info saadaval.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>See sünkroniseering kustutab kõik failid kohalikust kataloogist '%1'.⏎
Kui sina või adminstraator on sinu konto serveris algseadistanud, siis vali "Säilita failid". Kui soovid oma andmed kustutada, vali "Kustuta kõik failid".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -596,17 +597,17 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
@@ -1278,7 +1279,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1373,17 +1374,22 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1565,7 +1571,7 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Sinu sessioon on aegunud. Sa pead kliendi kasutamiseks uuesti sisse logima.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Tekkis sisemine viga number %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sümboolsed lingid ei ole sünkroniseerimisel toetatud.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Fail on märgitud ignoreeritavate nimistus.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
</message>
@@ -2074,17 +2080,22 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Ühtegi üksust pole hiljuti sünkroniseeritud</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Sünkroniseerin %1 / %2 (%3 / %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Ajakohane</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index a1e81d5..5d8e7fa 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -144,29 +144,23 @@
<translation><p>Benetan nahi duzu <i>%1</i> karpeta leheneratu eta zure bezeroaren datu basea berreraiki?</p><p><b>Oharra:</p> Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation><a href="%1">%2</a>ra konektatuta.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation><a href="%1">%2</a>ra konektatuta.</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation> <a href="%1">%2</a>ra konektatuta <i>%3</i> erabiltzailearekin.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
</message>
@@ -346,30 +347,30 @@
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -593,17 +594,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1273,7 +1274,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1368,17 +1369,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1560,7 +1566,7 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1913,32 +1919,32 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Fitxategia baztertutakoen zerrendan dago.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
@@ -2067,17 +2073,22 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation>Ez da azken aldian ezer sinkronizatu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Eguneratua</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 8275b1a..b095373 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -144,29 +144,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
@@ -186,22 +180,29 @@
<translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -346,30 +347,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,17 +594,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,7 +1272,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1366,17 +1367,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1557,7 +1563,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
@@ -1910,32 +1916,32 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
@@ -2064,17 +2070,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>تا تاریخ</translation>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 7f27948..9a42bcd 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -144,29 +144,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3/%4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 palvelimen tilasta käytössä.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Muodosta yhteys - <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1/%2, tiedosto %3/%4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Muodosta yhteys - <a href="%1">%2</a>.</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Tallennustilan käyttötietoja ei ole juuri nyt saatavilla.</translation>
</message>
@@ -346,30 +347,30 @@
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -593,17 +594,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
@@ -1273,7 +1274,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1368,17 +1369,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1559,7 +1565,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Istunto on vanhentunut. Kirjaudu uudelleen jatkaaksesi sovelluksen käyttämistä.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1914,32 +1920,32 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Ilmeni sisäinen virhe, jonka numero on %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
@@ -2068,17 +2074,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Kohteita ei ole synkronoitu äskettäin</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Synkronoidaan %1/%2 (%3/%4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Ajan tasalla</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index c4be4b9..d80fdc0 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -144,29 +144,23 @@
<translation><p>Voulez-vous réellement réinitialiser le dossier <i>%1</i> et reconstruire votre base de données cliente ?</p><p><b>Note :</b> Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 de %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 d'espace utilisé sur le serveur.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Aucune connexion à %1 à <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
@@ -186,22 +180,29 @@
<translation>La synchronisation est en cours.<br/>Voulez-vous y mettre un terme?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Connecté à <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 de %2, fichier %3 de %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Connecté à <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connecté à <a href="%1">%2</a> en tant que <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Cette synchronisation supprimerait tous les fichiers du dossier local de synchronisation '%1'.
Si vous-même ou votre administrateur avez réinitialisé votre compte sur le serveur, choisissez "Garder les fichiers". Si vous voulez que vos données soient supprimées, choisissez "Supprimer tous les fichiers".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -596,17 +597,17 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Temps de connexion expiré</translation>
</message>
@@ -1278,7 +1279,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1373,17 +1374,22 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation>
</message>
@@ -1565,7 +1571,7 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Votre session a expiré. Vous devez vous connecter à nouveau pour continuer à utiliser le client.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Une erreur interne numéro %1 s'est produite.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Cet élément n'a pas été synchronisé en raison des erreurs précédentes : %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Les liens symboliques ne sont pas supportés par la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Le fichier est présent dans la liste de fichiers à ignorer.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Le fichier contient des caractères invalides qui ne peuvent être synchronisés entre plate-formes.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Impossible d'ouvrir le journal de synchronisation</translation>
</message>
@@ -2074,17 +2080,22 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Aucun item synchronisé récemment</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Synchronisation en cours : %1 de %2 (%3 de %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index d4ae061..2680e3f 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -144,29 +144,23 @@
<translation><p>Confirma que quere restabelecer o cartafol <i>%1</i> e reconstruír as súa base datos no cliente?</p><p><b>Nota:</b> Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 de %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation> Espazo usado do servidor %1 (%3%) de %2.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Sen conexión con %1 en <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Estase realizando a sincronización.<br/>Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Conectado a <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 de %2, ficheiro %3 de %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronización retirará todos os ficheiros do cartafol local de sincronización «%1».
Se vostede, ou o administrador, restabeleceu a súa conta no servidor, escolla «Manter os ficheiros». Se quere que os seus datos sexan eliminados, escolla «Retirar todos os ficheiros».</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -596,17 +597,17 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
@@ -1278,7 +1279,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1373,17 +1374,22 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>O ficheiro local cambiou durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presente)</translation>
</message>
@@ -1565,7 +1571,7 @@ Tente sincronizalos de novo.</translation>
<translation>Caducou a sesión. É necesario que volva a acceder para seguir usando o cliente. </translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ Tente sincronizalos de novo.</translation>
<translation>Produciuse un erro interno número %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Este elemento non foi sincronizado por mor de erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Non foi posíbel abrir o rexistro de sincronización</translation>
</message>
@@ -2074,17 +2080,22 @@ Tente sincronizalos de novo.</translation>
<translation>Non hai elementos sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Sincronizando %1 de %2 (%3 de %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index dc500c4..f71c03f 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -144,29 +144,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
@@ -186,22 +180,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -346,30 +347,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>El legyen távolítva az összes fájl?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -593,17 +594,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,7 +1272,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1366,17 +1367,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1557,7 +1563,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
@@ -1910,32 +1916,32 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
@@ -2064,17 +2070,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Frissítve</translation>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 5c68a44..7c885e1 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -144,29 +144,23 @@
<translation><p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 di %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) di %2 spazio in uso sul server.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nessuna connessione a %1 su <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Connesso a <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 di %2, file %3 di %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Connesso a <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connesso a <a href="%1">%2</a> come <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Questa sincronizzazione rimuoverà tutti i file nella cartella di sincronizzazione locale '%1'.
Se tu o il tuo amministratore avete ripristinato il tuo account sul server, scegli "Mantieni i file". Se desideri che i dati siano rimossi, scegli "Rimuovi tutti i file".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -596,17 +597,17 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
@@ -1277,7 +1278,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1372,17 +1373,22 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Un file locale è cambiato durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation>
</message>
@@ -1564,7 +1570,7 @@ Prova a sincronizzare nuovamente.</translation>
<translation>La tua sessione è scaduta. Devi effettuare nuovamente l'accesso per continuare a utilizzare il client.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1919,32 +1925,32 @@ Prova a sincronizzare nuovamente.</translation>
<translation>SI è verificato un errore interno numero %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>L'elemento non è sincronizzato a causa dell'errore precedente: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Il file è stato aggiunto alla lista ignorati.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
@@ -2073,17 +2079,22 @@ Prova a sincronizzare nuovamente.</translation>
<translation>Nessun elemento sincronizzato di recente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Sincronizzazione di %1 di %2 (%3 di %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 5624582..fa16f0a 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -144,29 +144,23 @@
<translation><p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%4 中 %3 完了)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 使用中のサーバー領域</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation><a href="%2">%3</a> に %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
@@ -186,22 +180,29 @@
<translation>同期作業を実行中です。<br/>終了しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation><a href="%1">%2</a> へ接続しました。</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 of %2, ファイル数 %3 of %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation><a href="%1">%2</a> へ接続しました。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation> <a href="%1">%2</a> に <i>%3</i> として接続</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
@@ -346,14 +347,14 @@
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>この同期により、ローカルの同期フォルダー '%1'にある全ファイルが削除されます。
あなた、または管理者がサーバー上のアカウントをリセットした場合、「ファイルを残す」を選んでください。データを削除したい場合は、「すべてのファイルを削除」を選んでください。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -596,17 +597,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
@@ -1276,7 +1277,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation>
</message>
@@ -1371,17 +1372,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しません。(e-tag が存在しません)</translation>
</message>
@@ -1563,7 +1569,7 @@ It is not advisable to use it.</source>
<translation>セッションの期限が切れました。クライアントを使用し続けるには再ログインが必要です。</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1918,32 +1924,32 @@ It is not advisable to use it.</source>
<translation>内部エラー番号 %1 が発生しました。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>このアイテムは、以前にエラーが発生していたため同期させません: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同期の際にシンボリックリンクはサポートしていません</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>ファイルは除外リストに登録されています。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
@@ -2072,17 +2078,22 @@ It is not advisable to use it.</source>
<translation>最近同期されたアイテムはありません。</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>%2 中の %1 を同期しています ( %4 中 %3 完了)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>最新です</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 7b529d0..7bd39c6 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -144,29 +144,23 @@
<translation><p>Wilt u de map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p> [...]
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 van %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) van %2 serverruimte in gebruik.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Geen verbinding naar %1 op <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Verbonden met <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 van %2, bestand %3 van %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Verbonden met <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Verbonden met <a href="%1">%2</a> als <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Deze synchronisatie verwijdert alle bestanden in lokale synchronisatiemap '%1'.
Als u of uw beheerder uw account op de server heeft gereset, kies dan "Bewaar bestanden". Als u uw bestanden wilt verwijderen, kies dan "Verwijder alle bestanden".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle besta
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -596,17 +597,17 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
@@ -1278,7 +1279,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1373,17 +1374,22 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
</message>
@@ -1565,7 +1571,7 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>Uw sessie is verstreken. U moet opnieuw inloggen om de client-applicatie te gebruiken.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>Interne fout nummer %1 opgetreden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolic links worden niet ondersteund bij het synchroniseren.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>De file is opgenomen op de negeerlijst.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Niet in staat om een synchornisatie journaal te starten.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync journal niet openen</translation>
</message>
@@ -2074,17 +2080,22 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>Recent niets gesynchroniseerd</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Synchroniseren %1 van %2 (%3 van %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index aee440c..4e3fc63 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -144,29 +144,23 @@
<translation><p>Czy rzeczywiście chcesz zresetować folder <i>%1</i> i przebudować bazę klientów?</p><p><b>Uwaga:</b> Ta funkcja została przewidziana wyłącznie do czynności technicznych. Nie zostaną usunięte żadne pliki, ale może to spowodować znaczący wzrost ruchu sieciowego i potrwać kilka minut lub godzin, w zależności od rozmiaru folderu. Używaj tej opcji wyłącznie, jeśli Twój administrator doradził Ci takie działanie.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 z %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 przestrzeni na serwerze w użyciu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Brak połączenia do %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Podłączony do <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 z %2, plik %3 z %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Podłączony do <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Podłączony do <a href="%1">%2</a> jako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Ta synchronizacja usunie wszystkie pliku z lokalnego folderu synchronizacji '%1'.
Jeśli Ty lub Twój administrator zresetowali Twoje konto na serwerze, wybierz "Zachowaj pliki". Jeśli chcesz aby Twoje dane zostały usunięte, wybierz "Usuń wszystkie pliki".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te
Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -596,17 +597,17 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
@@ -1278,7 +1279,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1373,17 +1374,22 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation>
</message>
@@ -1565,7 +1571,7 @@ Niezalecane jest jego użycie.</translation>
<translation>Twoja sesja wygasła. Musisz ponownie się zalogować, aby nadal używać klienta</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ Niezalecane jest jego użycie.</translation>
<translation>Wystąpił błąd wewnętrzny numer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Ten element nie jest zsynchronizowane z powodu poprzednich błędów: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linki symboliczne nie są wspierane przy synchronizacji. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Plik jest na liście plików ignorowanych.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nie można zainicjować synchronizacji dziennika.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
@@ -2074,17 +2080,22 @@ Niezalecane jest jego użycie.</translation>
<translation>Brak ostatnich synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Synchronizacja %1 z %2 (%3 z %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Aktualne</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 368971c..b100502 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -144,29 +144,23 @@
<translation><p>Deseja mesmo repor a pasta <i>%1</i> e reconstruir a base de dados do seu cliente?</p><p><b>Nota:</b> Esta função é desenhada apenas para efeitos de manutenção. Os ficheiros não irão ser removidos, mas este processo pode aumentar o tráfego de dados e demorar alguns minutos ou horas a completar, dependendo do tamanho da pasta. Utilize esta funcionalidade apenas se aconselhado pelo seu administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 de %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 de espaço utilizado.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Sem ligação a %1 em <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>A operação de sincronização está a ser executada.<br/>Deseja terminar?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Conectado a <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 de %2, ficheiro %3 de %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Conectado a <a href="%1">%2</a>.</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Histórico de utilização de armazenamento não disponível.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronização irá remover todos os ficheiros sincronizados na pasta local '%1'.
Se você ,ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -361,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -595,17 +596,17 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhum E-Tag recebido do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tentando uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou </translation>
</message>
@@ -1275,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="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1370,17 +1371,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mas faz parte de uma prtilha só de leitura. Foi restaurado mas a edição está no ficheiro de conflito.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Ficheiro local alterado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1562,7 +1568,7 @@ Por favor tente sincronizar novamente.</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1918,32 +1924,32 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>O item não está sincronizado devido a erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ficheiros a ignorar.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossível inicializar sincronização 'journal'.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
@@ -2072,17 +2078,22 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>Sem itens sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>A sincronizar %1 de %2 (%3 de %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 6e96827..8d6edc6 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -144,29 +144,23 @@
<translation><p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar o tráfego de dados significativo e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 de %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 do espaço em uso no servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nenhuma conexão para %1 em <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Sem %1 conexão configurada.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>A operação de sincronização está acontecendo.<br/>deseja finaliza-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Conectado à <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 of %2, file %3 de %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Conectado à <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente, não há informações de uso de armazenamento disponível.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Esta sincronização irá remover todos os arquivos na pasta de sincronização local '%1'.
Se você ou o administrador tiver que redefinir a sua conta no servidor, escolha "Manter arquivos". Se você deseja que seus dados sejam removidos, escolha "Remover todos os arquivos".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Deseja remover todos os arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -596,17 +597,17 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
@@ -1276,7 +1277,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1371,17 +1372,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Arquivo local modificado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation>
</message>
@@ -1563,7 +1569,7 @@ Tente sincronizar novamente.</translation>
<translation>Sua sessão expirou. É preciso re-login para continuar a usar o cliente.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1918,32 +1924,32 @@ Tente sincronizar novamente.</translation>
<translation>Um ocorreu um erro interno de número %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>O item não está sincronizado devido a erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linques simbólicos não são suportados em sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>O arquivo está listado na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Não é possível abrir o arquivo de sincronização</translation>
</message>
@@ -2072,17 +2078,22 @@ Tente sincronizar novamente.</translation>
<translation>Não há itens sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Sincronizando %1 de %2 (%3 de %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Até a data</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 1464aad..bf288ca 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -144,29 +144,23 @@
<translation><p>Вы действительно хотите сбросить папку <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Важно:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера папки, операция может занять от нескольких минут до нескольких часов и может быть передан большой объем данных. Используйте данную операцию только по рекомендации администратора.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Синхронизация запущена.<br/>Вы хотите, остановить ее?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Соединились с <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 из %2, файл %3 из %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Соединились с <a href="%1">%2</a>.</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Подключён к <a href="%1">%2</a> как <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Это действие может удалить все файлы в локальной папке '%1'.
Если вы или ваш администратор заново создали вашу учётную запись на сервере, выберите "Сохранить файлы". Если вы хотите стереть всё - выберите "Удалить все файлы".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -596,17 +597,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1278,7 +1279,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1373,17 +1374,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1565,7 +1571,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронизация символических ссылок не поддерживается.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не удалось инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
@@ -2074,17 +2080,22 @@ It is not advisable to use it.</source>
<translation>Недавно ничего не синхронизировалсь</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Актуальная версия</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 569b394..745497b 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -116,7 +116,7 @@
<message>
<location filename="../src/mirall/accountsettings.ui" line="123"/>
<source><b>Note:</b> Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation><b>Poznámka:<b> Niektoré priečinky, zahŕňajúc sieťové alebo zdieľané, môžu mať odlišné limity.</translation>
+ <translation><b>Poznámka:<b> Niektoré priečinky, vrátane sieťových alebo zdieľaných, môžu mať odlišné limity.</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="161"/>
@@ -136,7 +136,7 @@
<message>
<location filename="../src/mirall/accountsettings.cpp" line="355"/>
<source>Confirm Folder Reset</source>
- <translation>Potvrdiť resetovanie priečinka</translation>
+ <translation>Potvrdiť zresetovanie priečinka</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="356"/>
@@ -144,29 +144,23 @@
<translation><p>Skutočne chcete zresetovať priečinok <i>%1</i> a opätovne zostaviť klientskú databázu?</p><p><b>Poznámka:</b> Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 of %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 miesta na disku je použité. </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Žiadne spojenie s %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Pripojené k <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 z %2, súbor %3 z %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Pripojené k <a href="%1">%2</a>.</translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Pripojené k <a href="%1">%2</a> ako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Teraz nie sú k dispozícii žiadne informácie o využití úložiska.</translation>
</message>
@@ -239,7 +240,7 @@
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
<source>The configured server for this client is too old</source>
- <translation>Nakonfigurovaný server pre tohto klienta je príliš starý</translation>
+ <translation>Server nakonfigurovaný pre tohto klienta je príliš starý</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
@@ -346,14 +347,14 @@
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Táto synchronizácia odstráni všetky súbory v lokálnom synchronizačnom priečinku '%1'.
Pokiaľ vy alebo váš správca zresetoval váš účet na serveri, vyberte možnosť "Ponechať súbory". Pokiaľ chcete odstrániť vaše dáta, vyberte možnosť "Odstrániť všetky súbory".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -596,17 +597,17 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Spojenie vypršalo</translation>
</message>
@@ -631,7 +632,7 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<message>
<location filename="../src/mirall/generalsettings.ui" line="33"/>
<source>Show Desktop Notifications</source>
- <translation>Zobraziť desktopové notifikácie</translation>
+ <translation>Zobraziť notifikácie na desktope</translation>
</message>
<message>
<location filename="../src/mirall/generalsettings.ui" line="40"/>
@@ -717,12 +718,12 @@ Zaškrtnuté položky budú taktiež zmazané pokiaľ bránia priečinku pri ods
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="128"/>
<source>Edit Ignore Pattern</source>
- <translation>Úprava ignorovacích vzorov</translation>
+ <translation>Úprava vzorov súborov pre vynechanie</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="129"/>
<source>Edit ignore pattern:</source>
- <translation>Uprav ignorovací vzor:</translation>
+ <translation>Uprav vzor súboru pre vynechanie:</translation>
</message>
<message>
<location filename="../src/mirall/ignorelisteditor.cpp" line="140"/>
@@ -1068,7 +1069,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="223"/>
<source>Could not connect securely. Do you want to connect unencrypted instead (not recommended)?</source>
- <translation>Nemožno bezpečne pripojiť. Chcete sa pripojiť nešifrovane (neodporúča sa)?</translation>
+ <translation>Nemožno sa bezpečne pripojiť. Chcete sa pripojiť nešifrovane (neodporúča sa)?</translation>
</message>
<message>
<location filename="../src/wizard/owncloudsetuppage.cpp" line="224"/>
@@ -1278,7 +1279,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1373,17 +1374,22 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Súbor bol zmenený, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený a upravená verzia je uložená v konfliktnom súbore.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Lokálny súbor bol zmenený počas synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1463,7 +1469,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="229"/>
<source>Currently no files are ignored because of previous errors.</source>
- <translation>V súčastnosti niesú na čiernej listine žiadne súbory kvôli predchádzajúcim chybovým stavom.</translation>
+ <translation>V súčastnosti nie sú na čiernej listine žiadne súbory kvôli predchádzajúcim chybovým stavom.</translation>
</message>
<message>
<location filename="../src/mirall/protocolwidget.cpp" line="231"/>
@@ -1564,7 +1570,7 @@ Nie je vhodné ju používať.</translation>
<translation>Platnosť relácie uplynula. Musíte sa znovu prihlásiť, ak chcete pokračovať v používaní klienta.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1795,7 +1801,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="102"/>
<source>The system time on this client is different than the system time on the server. Please use a time synchronization service (NTP) on the server and client machines so that the times remain the same.</source>
- <translation>Systémový čas daného klienta je odlišný od systémového času na serveri. Prosím zvážte použitie sieťovej časovej synchronizačnej služby (NTP) na danom serveri a klientských strojoch, za účelom udržania rovnakého času.</translation>
+ <translation>Systémový čas tohoto klienta je odlišný od systémového času na serveri. Prosím zvážte použitie sieťovej časovej synchronizačnej služby (NTP) na serveri a klientských strojoch, aby bol na nich rovnaký čas.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="107"/>
@@ -1875,7 +1881,7 @@ Nie je vhodné ju používať.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="154"/>
<source>A network connection timeout happend.</source>
- <translation>Skončil časový limit sieťového pripojenia</translation>
+ <translation>Skončil sa časový limit sieťového pripojenia.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="157"/>
@@ -1919,32 +1925,32 @@ Nie je vhodné ju používať.</translation>
<translation>Vyskytla sa vnútorná chyba číslo %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Položka nebola synchronizovaná kvôli predchádzajúcej chybe: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
- <translation>Symbolické odkazy nie sú podporované v synchronizácii.</translation>
+ <translation>Symbolické odkazy nie sú podporované pri synchronizácii.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Súbor je zapísaný na zozname ignorovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
- <translation>Súbor obsahuje neplatné znaky, ktoré nemôžu byť synchronizované medzi platformami.</translation>
+ <translation>Súbor obsahuje neplatné znaky, ktoré nemôžu byť zosynchronizované medzi platformami.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Nemožno otvoriť sync žurnál</translation>
</message>
@@ -2073,17 +2079,22 @@ Nie je vhodné ju používať.</translation>
<translation>Žiadne nedávno synchronizované položky</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Synchronizácia %1 z %2 (%3 of %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Až do dnešného dňa</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index a74ed4c..40216db 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -144,29 +144,23 @@
<translation><p>Ali ste prepričani, da želite mapo <i>%1</i> ponastaviti in ponovno izgraditi podatkovno zbirko?</p><p><b>Opozorilo:</b> Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 od %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) od %2 prostora strežnika je v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Ni povezave z %1 pri <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljenih %1 povezav.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 od %2, datoteka %3 od %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Vzpostavljena je povezava z <a href="%1">%2</a> kot <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Z usklajevanjem bodo odstranjene vse krajevne datoteke v mapi '%1'.
Če je bil račun na strežniku kakorkoli ponastavljen, izberite možnost "Ohrani datoteke", če pa želite datoteke res odstraniti, izberite drugo možnost.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -596,17 +597,17 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Povezava prekinjena</translation>
</message>
@@ -1278,7 +1279,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation>Datoteke %1 ni možno prenesti zaradi nesoglasja z imenom lokalne datoteke!</translation>
</message>
@@ -1373,17 +1374,22 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Datoteka je bila krajevno spremenjena, vendar pa je označena za souporabo le za branje. Izvorna datoteka je obnovljena, vaše spremembe pa so zabeležene v datoteki spora.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Strežnik ni prepoznal zadnjega niza besed. (Ni bilo prisotnih e-značk)</translation>
</message>
@@ -1565,7 +1571,7 @@ Te je treba uskladiti znova.</translation>
<translation>Vaša seja je potekla.Ponovno se prijavite za nadaljevanje z uporabo odjemalca.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ Te je treba uskladiti znova.</translation>
<translation>Prišlo je do notranje napake številka %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Predmet ni usklajen zaradi predhodne napake: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Usklajevanje simbolnih povezav ni podprto.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Datoteka je na seznamu prezrtih datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
@@ -2074,17 +2080,22 @@ Te je treba uskladiti znova.</translation>
<translation>Ni nedavno usklajenih predmetov</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Poteka usklajevanje %1 od %2 (%3 od %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Ni posodobitev</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 24e8124..30d2807 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -144,29 +144,23 @@
<translation><p>Vill du verkligen nollställa mappen <i>%1</i> och återställa din databas?</p><p><b>Notera:</b> Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3 av %4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) av %2 server utrymme används.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Ingen anslutning till %1 vid <a href="%2">%3</a></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation>Ansluten till <a href="%1">%2</a>.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 av %2, fil %3 av %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation>Ansluten till <a href="%1">%2</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Ansluten till <a href="%1">%2</a> as <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Denna synk skulle radera alla filer i den lokala mappen '%1'.
Om systemadministratören har återställt ditt konto på servern, välj "Behåll filer". Om du vill att dina filer ska raderas, välj "Radera alla filer".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -596,17 +597,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ingen e-tag mottogs från servern, kontrollera proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
@@ -1278,7 +1279,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1373,17 +1374,22 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Filen ändrades lokalt men är en del av en endast-läsbar delning. Den återställdes och din editering är i konflikt filen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Servern bekräftade inte det sista fil-fragmentet (Ingen e-tag fanns tillgänglig)</translation>
</message>
@@ -1565,7 +1571,7 @@ Försök att synka dessa igen.</translation>
<translation>Din session har gått ut. Du måste logga in på nytt för att kunna fortsätta använda klienten.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ Försök att synka dessa igen.</translation>
<translation>Ett internt fel hände. nummer %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Objektet kunde inte synkas på grund av tidigare fel: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symboliska länkar stöds ej i synkningen.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Filen är listad i ignorerings listan.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Filen innehåller ogiltiga tecken som inte kan synkas oberoende av plattform.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Kan inte initialisera en synk journal. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
@@ -2074,17 +2080,22 @@ Försök att synka dessa igen.</translation>
<translation>Inga filer har synkroniseras nyligen</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Synkar %1 av %2 (%3 av %4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Aktuell version</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 0503d05..25c2699 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -144,29 +144,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
@@ -186,22 +180,29 @@
<translation>การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -346,30 +347,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,17 +594,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,7 +1272,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1366,17 +1367,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1557,7 +1563,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
@@ -1910,32 +1916,32 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
@@ -2064,17 +2070,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 03a0948..25fdcf6 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -144,29 +144,23 @@
<translation><p>Gerçekten <i>%1</i> klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?</p><p><b>Not:</b> Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacak, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.</p></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation>%1 %2 (%3/%4)</translation>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>Sunucudaki %2'lık kotanın %1'ı (%%3) kullanılıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation><a href="%2">%3</a> üzerinde %1 bağlantısı yok.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
- <translation><a href="%1">%2</a> ile bağlı.</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1/%2, %3/%4 dosya</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation><a href="%1">%2</a> ile bağlı.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation><a href="%1">%2</a> bağlantısı <i>%3</i> olarak yapıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation>
</message>
@@ -346,14 +347,14 @@
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>Bu eşitleme, yerel eşitleme klasörü '%1' içindeki tüm dosyaları kaldıracak.
Eğer siz veya yöneticiniz sunucudaki hesabınızı sıfırlamışsa, "Dosyaları koru" seçin. Eğer verinizin kaldırılmasını istiyorsanız, "Tüm dosyaları kaldır" seçin.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -596,17 +597,17 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>Bağlantı Zaman Aşımı</translation>
</message>
@@ -1278,7 +1279,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<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>
@@ -1373,17 +1374,22 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>Eşitleme sırasında yerel dosya değişti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
@@ -1565,7 +1571,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>Oturumunuzun süresi doldu. İstemciyi kullanmaya devam etmek için yeniden oturum açmanız gerekiyor.</translation>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1920,32 +1926,32 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>%1 numaralı bir hata oluştu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Bu öge önceki hatalar koşullarından dolayı eşitlenemiyor: %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sembolik bağlantılar eşitlemede desteklenmiyor.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>Bir eşitleme günlüğü başlatılamadı.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>Eşitleme günlüğü açılamıyor</translation>
</message>
@@ -2074,17 +2080,22 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>Yakın zamanda eşitlenen öge yok</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
- <translation>Eşitlenen %1/%2 (%3/%4)</translation>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>Güncel</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 83cc844..69956d7 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -144,29 +144,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
@@ -186,22 +180,29 @@
<translation>Виконується процедура синхронізації.<br/>Бажаєте відмінити?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -346,30 +347,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,17 +594,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,7 +1272,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1366,17 +1367,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1557,7 +1563,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
@@ -1910,32 +1916,32 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
@@ -2064,17 +2070,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index a256a81..bb423fd 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -144,29 +144,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
@@ -186,22 +180,29 @@
<translation>正在执行同步。<br />您确定要关闭它吗？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 of %2, file %3 of %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -346,14 +347,14 @@
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation>这个同步将会移除本地同步文件夹 %1 下的所有文件。
如果你或者你的管理员在服务器上重置了你的帐号，请选择“保持文件”。如果你想移除你的数据，请选择“移除全部文件”。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +363,17 @@ Are you sure you want to perform this operation?</source>
你确定执行该操作吗？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -596,17 +597,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
@@ -1276,7 +1277,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1371,17 +1372,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1562,7 +1568,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation>%1 - %2</translation>
</message>
@@ -1915,32 +1921,32 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation>无法初始化同步日志</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
@@ -2069,17 +2075,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>更新</translation>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 24e6831..7cc0008 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -144,29 +144,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="620"/>
- <source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/mirall/accountsettings.cpp" line="623"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="626"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="719"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="725"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="758"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="765"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="771"/>
<source>No %1 connection configured.</source>
<translation>無%1連線設定</translation>
</message>
@@ -186,22 +180,29 @@
<translation>正在同步中<br/>你真的想要中斷？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="751"/>
- <source>Connected to <a href="%1">%2</a>.</source>
+ <location filename="../src/mirall/accountsettings.cpp" line="620"/>
+ <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"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="632"/>
- <source>%1 of %2, file %3 of %4</source>
- <translation>%1 的 %2, 檔案 %3 的 %4</translation>
+ <location filename="../src/mirall/accountsettings.cpp" line="635"/>
+ <source>%1 of %2, file %3 of %4
+Total time left %5</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="754"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
+ <source>Connected to <a href="%1">%2</a>.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/accountsettings.cpp" line="760"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="723"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="729"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -346,30 +347,30 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="712"/>
+ <location filename="../src/mirall/folder.cpp" line="728"/>
<source>This sync would remove all the files in the local sync folder '%1'.
If you or your administrator have reset your account on the server, choose "Keep files". If you want your data to be removed, choose "Remove all files".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="715"/>
+ <location filename="../src/mirall/folder.cpp" line="731"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="719"/>
+ <location filename="../src/mirall/folder.cpp" line="735"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="721"/>
+ <location filename="../src/mirall/folder.cpp" line="737"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="722"/>
+ <location filename="../src/mirall/folder.cpp" line="738"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -593,17 +594,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="428"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="444"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="435"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="451"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="471"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="487"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
@@ -1271,7 +1272,7 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="485"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="501"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
@@ -1366,17 +1367,22 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="247"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="278"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="287"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="294"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="288"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
<source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
@@ -1557,7 +1563,7 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
+ <location filename="../src/creds/shibboleth/shibbolethwebview.cpp" line="100"/>
<source>%1 - %2</source>
<translation type="unfinished"/>
</message>
@@ -1910,32 +1916,32 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="240"/>
+ <location filename="../src/mirall/syncengine.cpp" line="241"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="284"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="287"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="286"/>
+ <location filename="../src/mirall/syncengine.cpp" line="290"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="453"/>
+ <location filename="../src/mirall/syncengine.cpp" line="458"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="549"/>
+ <location filename="../src/mirall/syncengine.cpp" line="554"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
@@ -2064,17 +2070,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="411"/>
- <source>Syncing %1 of %2 (%3 of %4)</source>
+ <location filename="../src/mirall/owncloudgui.cpp" line="409"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="413"/>
+ <source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="426"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="433"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="453"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="460"/>
<source>Up to date</source>
<translation>最新的</translation>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list