[Pkg-owncloud-commits] [owncloud-client] 191/333: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Apr 17 23:16:52 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 2fc61479f7cd5731a527aefb0e09fbd997f72066
Author: Mr. Jenkins <jenkins at owncloud.org>
Date: Fri Mar 21 01:26:37 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 75 +++++++++++++++++++++++++++---------------
translations/mirall_cs.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_de.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_el.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_en.ts | 75 +++++++++++++++++++++++++++---------------
translations/mirall_es.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_es_AR.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_et.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_eu.ts | 75 +++++++++++++++++++++++++++---------------
translations/mirall_fa.ts | 75 +++++++++++++++++++++++++++---------------
translations/mirall_fi.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_fr.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_gl.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_hu.ts | 75 +++++++++++++++++++++++++++---------------
translations/mirall_it.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_ja.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_nl.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_pl.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_pt.ts | 75 +++++++++++++++++++++++++++---------------
translations/mirall_pt_BR.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_ru.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_sk.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_sl.ts | 77 ++++++++++++++++++++++++++++----------------
translations/mirall_sv.ts | 75 +++++++++++++++++++++++++++---------------
translations/mirall_th.ts | 75 +++++++++++++++++++++++++++---------------
translations/mirall_uk.ts | 75 +++++++++++++++++++++++++++---------------
translations/mirall_zh_CN.ts | 75 +++++++++++++++++++++++++++---------------
translations/mirall_zh_TW.ts | 75 +++++++++++++++++++++++++++---------------
translations/pofiles/tr.po | 77 ++++++++++++++++++++++++++++----------------
29 files changed, 1439 insertions(+), 772 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index aa0e3c1..a353d7a 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -247,12 +247,12 @@
<translation>Actualitzeu el servidor a l'última versió i reestabliu el client.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>No es pot connectar amb %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Les credencials proporcionades no són correctes</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Això podria ser perquè la carpeta ha estat reconfigurada silenciosament, o que
Esteu segur que voleu executar aquesta operació?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -594,6 +594,19 @@ Esteu segur que voleu executar aquesta operació?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1807,27 +1820,27 @@ It is not advisable to use it.</source>
<translation>S'ha produït l'error intern número %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
@@ -1959,12 +1972,22 @@ It is not advisable to use it.</source>
<translation>%1 de %2 en ús</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Actualitzat</translation>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index ee6b72a..319ae2b 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -247,12 +247,12 @@
<translation>Prosím, aktualizujte na poslední verzi serveru a restartujte klienta.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Nelze se připojit k %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Poskytnuté přihlašovací údaje nejsou správné</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 dalších souborů bylo odebráno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl odebrán.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 dalších souborů bylo staženo.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl stažen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 a %2 dalších souborů bylo aktualizováno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl aktualizován.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 byl přejmenován na %2 a %3 dalších souborů bylo přejmenováno.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 byl přejmenován na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 byl přesunut do %2 a %3 dalších souborů bylo přesunuto.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 byl přemístěn do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -594,6 +594,19 @@ Opravdu chcete provést tuto akci?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1813,27 +1826,27 @@ Zkuste provést novou synchronizaci.
<translation>Nastala vnitřní chyba číslo %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Položka nebyla synchronizována kvůli předchozím chybám:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
@@ -1965,12 +1978,22 @@ Zkuste provést novou synchronizaci.
<translation>%1% z %2 v používání</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synchronizování %1 z %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index d440609..e699ef4 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -248,12 +248,12 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Aktualisieren Sie auf die letzte Server-Version und starten Sie den Klient neu.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Verbinden mit %1 nicht möglich</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Die zur Verfügung gestellten Anmeldeinformationen sind nicht korrekt</translation>
</message>
@@ -286,75 +286,75 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde gelöscht.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 und %2 andere Dateien wurden aktualisiert</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde aktualisiert.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 wurde in %2 umbenannt und %3 andere Dateien wurden umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 wurde in %2 umbenannt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 wurde in %2 verschoben und %3 andere Dateien wurden verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -363,17 +363,17 @@ Vielleicht wurde der Ordner neu konfiguriert, oder alle Dateien wurden händisch
Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -595,6 +595,19 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1813,27 +1826,27 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>Interne Fehlernummer %1 aufgetreten.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
@@ -1965,12 +1978,22 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<translation>%1% von %2 benutzt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synchronisiere %1 von %2 (%3 von %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Aktuell</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index ea09209..8dd56d1 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -247,12 +247,12 @@
<translation>Παρακαλώ ενημερώστε στον τελευταίο διακομιστή και επανεκκινήστε το δέκτη.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Αδυναμία σύνδεσης με %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Τα παρεχόμενα διαπιστευτήρια δεν είναι σωστά</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να πραγματοποιήσετε αυτή εντολή;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -594,6 +594,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1811,27 +1824,27 @@ It is not advisable to use it.</source>
<translation>Ένα εσωτερικό σφάλμα με αριθμό %1 συνέβη.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Αυτό το αντικείμενο δεν θα συγχρονιστεί λόγω προηγούμενων σφαλμάτων:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
@@ -1963,12 +1976,22 @@ It is not advisable to use it.</source>
<translation>%1% από %2 σε χρήση</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Ενημερωμένο</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index eab76d2..b942da3 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -249,12 +249,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"></translation>
</message>
@@ -287,91 +287,91 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -593,6 +593,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <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="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1804,27 +1817,27 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
@@ -1956,12 +1969,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 2e7c59d..9ad18a7 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -247,12 +247,12 @@
<translation>Por favor actualice a la ultima verisón del servidor y reinicie el cliente</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Imposible conectar a %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Las credenciales proporcionadas no son correctas</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido eliminados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido descargados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 y %2 otros archivos han sido actualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 ha sido renombrado a %2 y %3 otros archivos han sido renombrados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ha sido renombrado a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 ha sido movido a %2 y %3 otros archivos han sido movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -594,6 +594,19 @@ Está seguro de que desea realizar esta operación?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1812,27 +1825,27 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>Ha ocurrido un error interno con número %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>El elemento no está sincronizado por errores previos:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
</message>
@@ -1964,12 +1977,22 @@ Intente sincronizar los archivos nuevamente.</translation>
<translation>%1% de %2 en uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Sincronizando %1 de %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 0fbbbc7..8fc883b 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -247,12 +247,12 @@
<translation>Por favor actualice a la última versión del servidor y reinicie el cliente.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Imposible conectar a %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Las credenciales otorgadas no son correctas</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
¿Estás seguro de que querés realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -594,6 +594,19 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1808,27 +1821,27 @@ Intente sincronizar estos nuevamente.</translation>
<translation>Error: ocurrió un error del tipo %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Los items no fueron sincronizados por errores previos:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Imposible inicializar un diario de sincronización.</translation>
</message>
@@ -1960,12 +1973,22 @@ Intente sincronizar estos nuevamente.</translation>
<translation>%1% de %2 en uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>actualizado</translation>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 4f71639..88071ad 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -247,12 +247,12 @@
<translation>Palun uuenda server viimasele versioonile ning taaskäivita klient.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>%1-ga ühendumine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Sisestatud kasutajatunnused pole õiged</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ See võib olla põhjustatud kataloogi ümberseadistusest või on toimunud kõiki
Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -594,6 +594,19 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1812,27 +1825,27 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Tekkis sisemine viga number %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
@@ -1964,12 +1977,22 @@ Proovi neid uuesti sünkroniseerida.</translation>
<translation>Kasutusel %1% / %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Ajakohane</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index 2857639..9597579 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -247,12 +247,12 @@
<translation>Mesedez eguneratu zerbitzarira eta berrabiarazi bezeroa.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Ezin izan da %1ra konektatu</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Emandako kredentzialak ez dira zuzenak</translation>
</message>
@@ -285,91 +285,91 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -591,6 +591,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1805,27 +1818,27 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation>Barne errore bat gertatu da, zenbakia %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation>Fitxategia baztertutakoen zerrendan dago.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
</message>
@@ -1957,12 +1970,22 @@ Saiatu horiek berriz sinkronizatzen.</translation>
<translation>%2tik %%1 erabilita</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Eguneratua</translation>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index d5fcf89..7d02410 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -247,12 +247,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -285,91 +285,91 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -591,6 +591,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1802,27 +1815,27 @@ It is not advisable to use it.</source>
<translation>یک خطای داخلی به شماره ی %1 اتفاق افتاد.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -1954,12 +1967,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>تا تاریخ</translation>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 50100c1..097bf13 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -247,12 +247,12 @@
<translation>Päivitä uusimpaan palvelinversioon ja käynnistä asiakasohjelmisto uudelleen.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Annetut tilitiedot eivät ole oikein</translation>
</message>
@@ -285,91 +285,91 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on poistettu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on ladattu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on päivitetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on nimetty uudeelleen muotoon %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -591,6 +591,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1804,27 +1817,27 @@ It is not advisable to use it.</source>
<translation>Tapahtui sisäinen virhe %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Kohde ei ole synkronoitu aiempien virheiden vuoksi:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -1956,12 +1969,22 @@ It is not advisable to use it.</source>
<translation>%1%/%2 käytössä</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synkronoidaan %1/%2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Ajan tasalla</translation>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 595ec8f..fe7bc0f 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -247,12 +247,12 @@
<translation>Veuillez mettre à jour avec la dernière version du serveur et redémarrer le client.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Impossible de se connecter à %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Les informations d'identification fournies ne sont pas correctes</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont été supprimés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été supprimé.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont été téléchargés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été téléchargé.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 et %2 autres fichiers ont été mis à jour.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été mis à jour.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 a été renommé en %2 et %3 autres fichiers ont été renommés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 a été renommé en %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 a été déplacé vers %2 et %3 autres fichiers ont été déplacés.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a été déplacé vers %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Cela est peut-être du à une reconfiguration silencieuse du dossier, ou parce q
Voulez-vous réellement effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -594,6 +594,19 @@ Voulez-vous réellement effectuer cette opération ?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1812,27 +1825,27 @@ Il est déconseillé de l'utiliser.</translation>
<translation>Une erreur interne numéro %1 est survenue.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Cet élément n'a pas été synchronisé en raison des erreurs précédentes :</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
@@ -1964,12 +1977,22 @@ Il est déconseillé de l'utiliser.</translation>
<translation>%1% de %2 occupés</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synchronisation en cours : %1 de %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index f21f60a..49faec1 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -247,12 +247,12 @@
<translation>Actualice ao último servidor e reinicie o cliente.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Non é posíbel conectar con %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>As credenciais fornecidas non son correctas</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron retirados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron descargados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>O ficheiro %1 e outros %2 foron enviados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado satisfactoriamente a %2 e outros %3 tamén foron renomeados satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido satisfactoriamente a %2 e outros %3 tamén foron movidos satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Isto podería ser debido a que o cartafol foi reconfigurado en silencio, ou a qu
Confirma que quere realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -594,6 +594,19 @@ Confirma que quere realizar esta operación?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1812,27 +1825,27 @@ Tente sincronizalos de novo.</translation>
<translation>Produciuse un erro interno número %1. </translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>O elemento non foi sincronizado por mor dos erros anteriores:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
</message>
@@ -1964,12 +1977,22 @@ Tente sincronizalos de novo.</translation>
<translation>Usado %1% de %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Sincronizando %1 de %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index f6ee537..fa2e906 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -247,12 +247,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -285,91 +285,91 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<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="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -591,6 +591,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1802,27 +1815,27 @@ It is not advisable to use it.</source>
<translation>Belső hiba történt, száma: %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -1954,12 +1967,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Frissítve</translation>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 36a7810..ab0d966 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -247,12 +247,12 @@
<translation>Aggiorna all'ultima versione del server e riavvia il client.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Impossibile connettersi a %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Le credenziali fornite non sono corrette</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati rimossi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato rimosso.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati scaricati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato scaricato.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 altri file sono stati aggiornati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato aggiornato.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 è stato rinominato in %2 e %3 altri file sono stati rinominati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 è stato rinominato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 è stato spostato in %2 e %3 altri file sono stati spostati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -594,6 +594,19 @@ Sei sicuro di voler eseguire questa operazione?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1811,27 +1824,27 @@ Prova a sincronizzare nuovamente.</translation>
<translation>SI è verificato un errore interno numero %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Questo oggetto non è stato sincronizzato a causa di errori precedenti:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
</message>
@@ -1963,12 +1976,22 @@ Prova a sincronizzare nuovamente.</translation>
<translation>%1% di %2 utilizzati</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Sincronizzazione di %1 di %2 (%3 di %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index eacdaf7..c1c1780 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -247,12 +247,12 @@
<translation>サーバーを最新にアップデートして、クライアントを再起動してください。</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>%1 に接続できません</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>与えられた認証情報が正しくありません。</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 と他 %2 個のファイルが削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 と他 %2 個のファイルがダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 と他 %2 個のファイルが更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 の名前が %2 に変更され、他 %3 個のファイルの名前が変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 が %2 に移され、他 %3 個のファイルが移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -595,6 +595,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1811,27 +1824,27 @@ It is not advisable to use it.</source>
<translation>内部エラー番号 %1 が発生しました。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>前にエラーが発生したため、対象アイテムは同期されていません:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同期の際にシンボリックリンクはサポートしていません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation>対象ファイルは無視した一覧に登録しています</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
@@ -1963,12 +1976,22 @@ It is not advisable to use it.</source>
<translation>%2 のうち %1% を使用中</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>最新です</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index df09a1e..de47807 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -247,12 +247,12 @@
<translation>Werk update de server naar de nieuwste versie en herstart het programma.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Niet in staat om verbinding te maken met %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>De verstrekte inloggegevens zijn niet juist</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn verwijderd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 is verwijderd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn gedownloaded.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 is gedownloaded.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 en %2 andere bestanden zijn bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 is bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 is hernoemd naar %2 en %3 andere bestanden zijn ook hernoemd.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 is hernoemd naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 is verplaatst naar %2 en %3 andere bestanden zijn ook verplaatst.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Dit kan komen doordat de map ongemerkt gereconfigureerd is of doordat alle besta
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -594,6 +594,19 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1812,27 +1825,27 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>Een interne fout met nummer %1 is opgetreden.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Dit object is niet gesynchroniseerd door eerdere fouten:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Niet in staat om een synchornisatie journaal te starten.</translation>
</message>
@@ -1964,12 +1977,22 @@ Probeer opnieuw te synchroniseren.</translation>
<translation>%1% van %2 gebruikt</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synchroniseren %1 van %2 (%3 van %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 7ca9d67..e8dca01 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -247,12 +247,12 @@
<translation>Proszę zaaktualizować serwer do najnowszej wersji i zrestartować klienta.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Nie mogę połączyć się do %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Podane dane logowania są nieprawidłowe</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 inne pliki zostały usunięte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 został usunięty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 pozostałe pliki zostały ściągnięte.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 został ściągnięty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 i %2 inne pliki zostały zaktualizowane.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 został uaktualniony.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 zmienił nazwę na %2 i %3 inne pliki mają zmienione nazwy.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 zmienił nazwę na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 został zmieniony na %2 i %3 inne pliku zostały przeniesione.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Mogło się tak zdarzyć z powodu niezauważonej rekonfiguracji folderu, lub te
Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -594,6 +594,19 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1812,27 +1825,27 @@ 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="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Produkt nie jest zsynchronizowany z powodu wcześniejszych błędów:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nie można zainicjować synchronizacji dziennika.</translation>
</message>
@@ -1964,12 +1977,22 @@ Niezalecane jest jego użycie.</translation>
<translation>%1% z %2 w użyciu</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Synchronizacja %1 z %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Aktualne</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index d4a9d2d..a9ba9f9 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -247,12 +247,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Não foi possível ligar a %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -285,91 +285,91 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -591,6 +591,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1803,27 +1816,27 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation>Ocorreu o erro interno %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -1955,12 +1968,22 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 15e5d8f..aa4a835 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -247,12 +247,12 @@
<translation>Por favor, atualize para o último servidor e reinicie o cliente.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Impossível se conectar a %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>As credenciais fornecidas não estão corretas</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram removidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram baixados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi baixado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 outros arquivos foram atualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado para %2 e %3 outros três arquivos foram renomeados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido para %2 e %3 outros arquivos foram movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Isso pode ser porque a pasta foi silenciosamente reconfigurada, ou todos os arqu
Você tem certeza que quer executar esta operação?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Remover Rodos os Arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -594,6 +594,19 @@ Você tem certeza que quer executar esta operação?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1810,27 +1823,27 @@ Tente sincronizar novamente.</translation>
<translation>Um erro interno número %1 ocorreu.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>O item não está sincronizado devido a erros anteriores:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
@@ -1962,12 +1975,22 @@ Tente sincronizar novamente.</translation>
<translation>%1% de %2 em uso</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Sincronizando %1 de %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Até a data</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 4cbf74c..d5632e3 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -247,12 +247,12 @@
<translation>Пожалуйста, обновите сервер до последней версии и перезапустите клиент.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Невозможно подключиться к %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Введённые учётные данные не верны</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -594,6 +594,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1812,27 +1825,27 @@ It is not advisable to use it.</source>
<translation>Произошла внутренняя ошибка номер %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Путь не синхронизируется из-за произошедших ошибок:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронизация символических ссылок не поддерживается.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не удалось инициализировать журнал синхронизации.</translation>
</message>
@@ -1964,12 +1977,22 @@ It is not advisable to use it.</source>
<translation>Используется %1% из %2.</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Актуальная версия</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 377418a..29e7248 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -247,12 +247,12 @@
<translation>Prosím aktualizujte na najnovšiu verziu servera a reštartujte klienta.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Nedá sa pripojiť k %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Poskytnuté poverenia nie sú správne</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Toto môže byť kvôli tichej rekonfigurácii priečinka, prípadne boli všetk
Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -594,6 +594,19 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1808,27 +1821,27 @@ Nie je vhodné ju používať.</translation>
<translation>Vyskytla sa interná chyba číslo %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Položka nebola synchronizovaná kvôli predchádzajúcim chybám:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nie sú podporované v synchronizácii.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<source>File contains invalid characters that can not be synced cross platform.</source>
<translation>Súbor obsahuje neplatné znaky, ktoré nemôžu byť synchronizované medzi platformami.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
</message>
@@ -1960,12 +1973,22 @@ Nie je vhodné ju používať.</translation>
<translation>%1% z %2 sa používa</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<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 49052ac..670f674 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -247,12 +247,12 @@
<translation>Posodobite strežnik in ponovno zaženite odjemalca.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Povezava z %1 ni mogoča.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Podana poverila niso pravilna.</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Mapa je bila morda odstranjena ali pa so bile nastavitve spremenjene.
Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -594,6 +594,19 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1812,27 +1825,27 @@ Te je treba uskladiti znova.</translation>
<translation>Prišlo je do notranje napake s številko %1.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Predmet ni usklajen zaradi predhodnih napak:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<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="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
</message>
@@ -1964,12 +1977,22 @@ Te je treba uskladiti znova.</translation>
<translation>%1% od %2 v uporabi</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Ni posodobitev</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 81c7fe0..80a250c 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -247,12 +247,12 @@
<translation>Uppgradera servern och starta sedan om klienten.</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>Kan ej koppla upp till %1</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>De angivna uppgifterna stämmer ej</translation>
</message>
@@ -285,75 +285,75 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -594,6 +594,19 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1807,27 +1820,27 @@ It is not advisable to use it.</source>
<translation>Internt fel nummer %1 uppstod.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -1959,12 +1972,22 @@ It is not advisable to use it.</source>
<translation>%1% av %2 används</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Aktuell version</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index b925c35..cd9b0dd 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -247,12 +247,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -285,91 +285,91 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -591,6 +591,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1802,27 +1815,27 @@ It is not advisable to use it.</source>
<translation>เกิดข้อผิดพลาดภายในระบบหมายเลข %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -1954,12 +1967,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 601f14c..317dd78 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -247,12 +247,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -285,91 +285,91 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -591,6 +591,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1802,27 +1815,27 @@ It is not advisable to use it.</source>
<translation>Виникла внутрішня помилка за номером %1 .</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -1954,12 +1967,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index e215b44..bd54d43 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -247,12 +247,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -285,91 +285,91 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -591,6 +591,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1802,27 +1815,27 @@ It is not advisable to use it.</source>
<translation>发生内部错误 %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -1954,12 +1967,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>更新</translation>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 115d231..aaa3dc7 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -247,12 +247,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
@@ -285,91 +285,91 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<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="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -591,6 +591,19 @@ Are you sure you want to perform this operation?</source>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1802,27 +1815,27 @@ It is not advisable to use it.</source>
<translation>發生內部錯誤，錯誤編號 %1</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
@@ -1954,12 +1967,22 @@ It is not advisable to use it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>最新的</translation>
</message>
diff --git a/translations/pofiles/tr.po b/translations/pofiles/tr.po
index 214b7e7..6a50486 100644
--- a/translations/pofiles/tr.po
+++ b/translations/pofiles/tr.po
@@ -247,12 +247,12 @@
<translation>Lütfen en son sunucuya güncelleyin veya istemciyi yeniden başlatın</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="128"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
<translation>%1 bağlantısı yapılamadı</translation>
</message>
<message>
- <location filename="../src/mirall/connectionvalidator.cpp" line="158"/>
+ <location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
<source>The provided credentials are not correct</source>
<translation>Sağlanan kimlik bilgileri doğru değil</translation>
</message>
@@ -285,75 +285,75 @@
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="399"/>
+ <location filename="../src/mirall/folder.cpp" line="397"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="401"/>
+ <location filename="../src/mirall/folder.cpp" line="399"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="406"/>
+ <location filename="../src/mirall/folder.cpp" line="404"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya indirildi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="408"/>
+ <location filename="../src/mirall/folder.cpp" line="406"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 indirildi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="413"/>
+ <location filename="../src/mirall/folder.cpp" line="411"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ve diğer %2 dosya güncellendi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="415"/>
+ <location filename="../src/mirall/folder.cpp" line="413"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 güncellendi.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="420"/>
+ <location filename="../src/mirall/folder.cpp" line="418"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1, %2 olarak ve diğer %3 dosya adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="422"/>
+ <location filename="../src/mirall/folder.cpp" line="420"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1, %2 olarak adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="427"/>
+ <location filename="../src/mirall/folder.cpp" line="425"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1, %2 konumuna ve diğer %3 dosya taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="429"/>
+ <location filename="../src/mirall/folder.cpp" line="427"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="435"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="694"/>
+ <location filename="../src/mirall/folder.cpp" line="692"/>
<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="697"/>
+ <location filename="../src/mirall/folder.cpp" line="695"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the file were manually removed.
Are you sure you want to perform this operation?</source>
@@ -362,17 +362,17 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="701"/>
+ <location filename="../src/mirall/folder.cpp" line="699"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="703"/>
+ <location filename="../src/mirall/folder.cpp" line="701"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="704"/>
+ <location filename="../src/mirall/folder.cpp" line="702"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -594,6 +594,19 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
</context>
<context>
+ <name>Mirall::GETFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="304"/>
+ <source>No E-Tag received from server, check Proxy/Gateway</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="310"/>
+ <source>We received a different E-Tag for resuming. Retrying next time.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::GeneralSettings</name>
<message>
<location filename="../src/mirall/generalsettings.ui" line="14"/>
@@ -1811,27 +1824,27 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>Hata iceri numarali %</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="242"/>
- <source>The item is not synced because of previous errors:</source>
- <translation>Önceki hata koşullarından dolayı bu öge eşitlenmedi:</translation>
+ <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="277"/>
+ <location filename="../src/mirall/syncengine.cpp" line="275"/>
<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="280"/>
+ <location filename="../src/mirall/syncengine.cpp" line="278"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/mirall/syncengine.cpp" line="283"/>
+ <location filename="../src/mirall/syncengine.cpp" line="281"/>
<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="438"/>
+ <location filename="../src/mirall/syncengine.cpp" line="436"/>
<source>Unable to initialize a sync journal.</source>
<translation>Bir eşitleme günlüğü başlatılamadı.</translation>
</message>
@@ -1963,12 +1976,22 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<translation>% %1 kullanılıyor. Toplam: %2</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="408"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="379"/>
+ <source>No items synced recently</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="395"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
<translation>Eşitlenen %1/%2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/mirall/owncloudgui.cpp" line="431"/>
+ <location filename="../src/mirall/owncloudgui.cpp" line="410"/>
+ <source>%1 (%2, %3)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/owncloudgui.cpp" line="437"/>
<source>Up to date</source>
<translation>Güncel</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