[Pkg-owncloud-commits] [owncloud-client] 137/219: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:19 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 b10c2b5946cdcc42966d1f445c2fff0a09c7f79a
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Sat Sep 20 01:25:29 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 51 +++++++++++++++++++++---------------
translations/mirall_cs.ts | 55 +++++++++++++++++++++++----------------
translations/mirall_de.ts | 55 +++++++++++++++++++++++----------------
translations/mirall_el.ts | 51 +++++++++++++++++++++---------------
translations/mirall_en.ts | 51 +++++++++++++++++++++---------------
translations/mirall_es.ts | 61 ++++++++++++++++++++++++++------------------
translations/mirall_es_AR.ts | 51 +++++++++++++++++++++---------------
translations/mirall_et.ts | 51 +++++++++++++++++++++---------------
translations/mirall_eu.ts | 51 +++++++++++++++++++++---------------
translations/mirall_fa.ts | 51 +++++++++++++++++++++---------------
translations/mirall_fi.ts | 51 +++++++++++++++++++++---------------
translations/mirall_fr.ts | 51 +++++++++++++++++++++---------------
translations/mirall_gl.ts | 51 +++++++++++++++++++++---------------
translations/mirall_hu.ts | 51 +++++++++++++++++++++---------------
translations/mirall_it.ts | 55 +++++++++++++++++++++++----------------
translations/mirall_ja.ts | 51 +++++++++++++++++++++---------------
translations/mirall_nl.ts | 51 +++++++++++++++++++++---------------
translations/mirall_pl.ts | 51 +++++++++++++++++++++---------------
translations/mirall_pt.ts | 51 +++++++++++++++++++++---------------
translations/mirall_pt_BR.ts | 55 +++++++++++++++++++++++----------------
translations/mirall_ru.ts | 51 +++++++++++++++++++++---------------
translations/mirall_sk.ts | 51 +++++++++++++++++++++---------------
translations/mirall_sl.ts | 51 +++++++++++++++++++++---------------
translations/mirall_sv.ts | 51 +++++++++++++++++++++---------------
translations/mirall_th.ts | 51 +++++++++++++++++++++---------------
translations/mirall_tr.ts | 55 +++++++++++++++++++++++----------------
translations/mirall_uk.ts | 51 +++++++++++++++++++++---------------
translations/mirall_zh_CN.ts | 51 +++++++++++++++++++++---------------
translations/mirall_zh_TW.ts | 51 +++++++++++++++++++++---------------
29 files changed, 914 insertions(+), 595 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index b4fe1e4..c885be1 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -309,78 +309,89 @@ Temps restant total %5</translation>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 altres fitxers s'han esborrat</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>S'ha esborrat '%1'</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 altres fitxers s'han descarregat.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>S'ha descarregat %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 i %2 altres fitxer(s) s'han actualitzat.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>S'ha actualitzat %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 s'ha reanomenat a %2 i %3 altres fitxers s'han reanomenat.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 s'ha reanomenat a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 s'ha reanomenat a %2 i %3 altres fitxers s'han eliminat.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 s'ha mogut a %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
@@ -626,17 +637,17 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No s'ha rebut cap E-Tag del servidor, comproveu el Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Hem rebut un E-Tag diferent en la represa. Es comprovarà la pròxima vegada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index d77b12d..72476bf 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -309,78 +309,89 @@ Celkový zbývající čas %5</translation>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<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="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation>Nezdařilo se přečtení systémového exclude souboru</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
@@ -626,17 +637,17 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Server odpověděl chybným rozsahem obsahu</translation>
</message>
@@ -1007,7 +1018,7 @@ si může v průběhu vyžádat dodatečná práva.</translation>
<message>
<location filename="../src/updater/ocupdater.cpp" line="89"/>
<source>Update status is unknown: Did not check for new updates.</source>
- <translation type="unfinished"/>
+ <translation>Stav aktualizace neznámý: Nové aktualizace nebyly zkontrolovány.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="93"/>
@@ -2007,7 +2018,7 @@ Zkuste provést novou synchronizaci.
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
<source>Hard links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Pevné odkazy nejsou při synchronizaci podporovány.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index 61ced9a..5ec684b 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -310,78 +310,89 @@ Gesamtzeit übrig %5</translation>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -390,17 +401,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
@@ -627,17 +638,17 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Server hat falschen Bereich für den Inhalt zurück gegeben</translation>
</message>
@@ -1008,7 +1019,7 @@ nach zusätzlichen Privilegien während des Prozesses.</translation>
<message>
<location filename="../src/updater/ocupdater.cpp" line="89"/>
<source>Update status is unknown: Did not check for new updates.</source>
- <translation type="unfinished"/>
+ <translation>Updatestatus unbekannt: Auf neue Updates wurde nicht geprüft.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="93"/>
@@ -2007,7 +2018,7 @@ Versuchen Sie diese nochmals zu synchronisieren.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
<source>Hard links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Harte Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index f903c95..aed9d36 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -310,78 +310,89 @@ Total time left %5</source>
<translation> Το %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 αφαιρέθηκε.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ληφθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Το αρχείο %1 και %2 άλλα αρχεία έχουν ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>Το %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -390,17 +401,17 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
@@ -627,17 +638,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Δεν ελήφθη E-Tag από το διακομιστή, ελέγξτε το διακομιστή μεσολάβησης/πύλη</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 2bc60f4..045e150 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -310,95 +310,106 @@ Total time left %5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
@@ -625,17 +636,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<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="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index dc8bdf8..155cda9 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -278,7 +278,7 @@ Tiempo restante %5</translation>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="138"/>
<source>timeout</source>
- <translation type="unfinished"/>
+ <translation>tiempo de espera</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="167"/>
@@ -309,78 +309,89 @@ Tiempo restante %5</translation>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<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="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Actividad en la Sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
- <translation type="unfinished"/>
+ <translation>No se pudo leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -626,17 +637,17 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió ninguna e-tag del servidor, revisar el proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>El servidor devolvió un content-range erróneo</translation>
</message>
@@ -1007,7 +1018,7 @@ pida privilegios adicionales durante el proceso.</translation>
<message>
<location filename="../src/updater/ocupdater.cpp" line="89"/>
<source>Update status is unknown: Did not check for new updates.</source>
- <translation type="unfinished"/>
+ <translation>Estado de actualización desconocido: no se buscaron nuevas actualizaciones.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="93"/>
@@ -2006,7 +2017,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
<source>Hard links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Los enlaces duros no están permitidos en la sincronización.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
@@ -2234,7 +2245,7 @@ Intente sincronizar los archivos nuevamente.</translation>
<message utf8="true">
<location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
<source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.<br/>Based on Mirall by Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademark [...]
- <translation type="unfinished"/>
+ <translation><p>Versión %2. Para más información consulte <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz y otros.<br/>Basado en Mirall por Duncan Mac-Vicar P.</small></p><p>Copyright ownCloud, Inc.</p><p>Licenciado bajo la Licencia Pública General de GNU (GPL) Versión 2.0<br/>ownCloud y el logotipo ownCloud son marcas [...]
</message>
</context>
<context>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index 8ba7db7..75c5d37 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -308,78 +308,89 @@ Total time left %5</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -388,17 +399,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
@@ -625,17 +636,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index 84edb35..715f97b 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -309,78 +309,89 @@ Aega kokku jäänud %5</translation>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 teist faili eemaldati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on eemaldatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 teist faili on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ja %2 teist faili on uuendatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on uuendatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 on ümber nimetatud %2 ja %3 muud faili on samuti ümber nimetatud</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on ümber nimetatud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 on tõstetud %2 ning %3 muud faili on samuti liigutatud.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
@@ -626,17 +637,17 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Server tagastas vale vahemiku</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index a599123..991283d 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -309,78 +309,89 @@ Geratzen den denbora %5</translation>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 eta beste %2 fitxategi ezabatu dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ezabatua izan da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 eta beste %2 fitxategi deskargatu dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 deskargatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 eta beste %2 fitxategi kargatu dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 kargatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 %2-(e)ra berrizendatu da eta beste %3 fitxategi berrizendatu dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 %2-(e)ra berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 %2-(e)ra berrizendatu da eta beste %3 fitxategi mugitu dira.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2-(e)ra mugitu da.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,17 @@ Izan daiteke karpeta isilpean birkonfiguratu delako edo fitxategi guztiak eskuz
Ziur zaude eragiketa hau egin nahi duzula?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
@@ -626,17 +637,17 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 3e49623..3da2003 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -308,95 +308,106 @@ Total time left %5</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 حذف شده است.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 بارگزاری شد.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>فعالیت همگام سازی</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>نگه داشتن فایل ها</translation>
</message>
@@ -623,17 +634,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index 9395497..685d03e 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -309,95 +309,106 @@ Aikaa jäljellä yhteensä %5</translation>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 muuta tiedostoa on poistettu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 muuta tiedostoa on ladattu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ja %2 muuta tiedostoa on päivitetty.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
@@ -624,17 +635,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index 8a8a4d5..b20f1e9 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -309,78 +309,89 @@ Temps restant total %5</translation>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<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="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
@@ -626,17 +637,17 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index fa5d992..d6f4dc0 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -309,78 +309,89 @@ Tempo total restante %5</translation>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<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="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -626,17 +637,17 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>O servidor devolveu un intervalo de contidos estragado</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 2e97f6c..e4d5f62 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -308,95 +308,106 @@ Total time left %5</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<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="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
@@ -623,17 +634,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 34f3039..9dc989b 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -309,78 +309,89 @@ Totale tempo rimanente %5</translation>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation>Impossibile leggere il file di esclusione di sistema</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
@@ -626,17 +637,17 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Il server ha restituito un content-range errato</translation>
</message>
@@ -1006,7 +1017,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="89"/>
<source>Update status is unknown: Did not check for new updates.</source>
- <translation type="unfinished"/>
+ <translation>Lo stato di aggiornamento è sconosciuto. Non è possibile verificare la presenza di nuovi aggiornamenti.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="93"/>
@@ -2005,7 +2016,7 @@ Prova a sincronizzare nuovamente.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
<source>Hard links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Gli hard link non sono supportati dalla sincronizzazione.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index 354015d..3f2dcbe 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -309,78 +309,89 @@ Total time left %5</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 と他 %2 個のファイルが更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移されました。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation>システム上の除外ファイルを読み込めません</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,17 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
@@ -626,17 +637,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>サーバーが間違ったcontent-rangeを返しました</translation>
</message>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index 93b5a7f..eb9ba9f 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -309,78 +309,89 @@ Totaal resterende tijd %5</translation>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,17 @@ Dit kan komen doordat de map ongemerkt opnieuw geconfigureerd is of doordat alle
Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
@@ -626,17 +637,17 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Server retourneerde verkeerde content-bandbreedte</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index 295d3df..e1ab63b 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -309,78 +309,89 @@ Pozostało czasu %5</translation>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation>Nie można przeczytać pliku wyłączeń</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
@@ -626,17 +637,17 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Serwer zwrócił błędną zakres zawartości</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index d690087..1a4ba17 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -309,78 +309,89 @@ Total time left %5</source>
<translation>Não é possível ler %1</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros ficheiros foram removidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Foi feito o download de outros ficheiros %1 e %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Fez o download de %1 </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Os ficheiros %1 e %2 foram actualizados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi actualizado.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado para %2 e %3 outros ficheiros foram renomeados.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido para %2 e %3 outros ficheiros foram movidos.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Actividade de sincronicação</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -388,17 +399,17 @@ Are you sure you want to perform this operation?</source>
Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha "Manter os ficheiros". Se quer apagar os seus dados, escolha "Remover todos os ficheiros".</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
@@ -625,17 +636,17 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhum E-Tag recebido do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tentando uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>O servidor retornou o alcance-conteúdo errado</translation>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 8bb7bf4..a2d7919 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -309,78 +309,89 @@ Total de tempo que falta 5%</translation>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o sistema de arquivo de exclusão</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
@@ -626,17 +637,17 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>O servidor retornou erro numa série-de-conteúdo</translation>
</message>
@@ -1006,7 +1017,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/updater/ocupdater.cpp" line="89"/>
<source>Update status is unknown: Did not check for new updates.</source>
- <translation type="unfinished"/>
+ <translation>Status de atualização é desconhecida: Não verifique para novas atualizações.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="93"/>
@@ -2004,7 +2015,7 @@ Tente sincronizar novamente.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
<source>Hard links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Links físicos não são compatíveis com a sincronização.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index c71dfe5..5f65709 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -309,78 +309,89 @@ Total time left %5</source>
<translation>%1 не читается.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>'%1' был удалён</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 был загружен.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 и ещё %2 других файла были обновлены.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 был обновлён.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 был перемещён в %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,17 @@ Are you sure you want to perform this operation?</source>
Вы уверены, что хотите выполнить операцию?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
@@ -626,17 +637,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Сервер вернул неверный диапазон содержания</translation>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 9c297c8..395ed38 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -309,78 +309,89 @@ Celkom zostáva %5</translation>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 ďalších súborov bolo zmazaných.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol zmazaný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 ďalších súborov bolo stiahnutých.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol stiahnutý.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 a %2 ďalších súborov bolo aktualizovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol aktualizovaný.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 bol premenovaný na %2 a %3 ďalších súborov bolo premenovaných.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 bol premenovaný na %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 bol presunutý do %2 a %3 ďalších súborov bolo presunutých.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 bol presunutý do %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
@@ -626,17 +637,17 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Server vrátil nesprávnu hodnotu Content-range</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index 079eb81..c7a46d7 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -308,78 +308,89 @@ Total time left %5</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 in %2 drugih datotek je odstranjenih.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je odstranjena.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 in %2 drugih datotek je prejetih.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je prejeta.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 in %2 drugih datotek je posodobljenih.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je posodobljena.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>Datoteka %1 je preimenovana v %2. Preimenovanih je bilo še %3 datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Datoteka %1 je preimenovana v %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>Datoteka %1 je premaknjena v %2. Premaknjenih je bilo še %3 datotek.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>Datoteka %1 je premaknjena v %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -388,17 +399,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
@@ -625,17 +636,17 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Odziv strežnika kaže na neveljaven obseg vsebine</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index 5d49e70..73fc6f0 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -309,78 +309,89 @@ Total tid kvar %5</translation>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 och %2 andra filer har tagits bort.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har tagits bort.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 och %2 andra filer har laddats ner.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har laddats ner.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 och %2 andra filer har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 har döpts om till %2 och %3 andra filer har bytt namn. </translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har döpts om till %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 har flyttats till %2 och %3 andra filer har tagits bort.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
@@ -626,17 +637,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ingen e-tag mottogs från servern, kontrollera proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 2daf0c5..158038f 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -308,95 +308,106 @@ Total time left %5</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation type="unfinished"/>
</message>
@@ -623,17 +634,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 36f55a9..3a613cb 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -309,78 +309,89 @@ Toplam kalan süre: %5</translation>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<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="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<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="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<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="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<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="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -389,17 +400,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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
@@ -626,17 +637,17 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation>Sunucu yanlış içerik aralığı döndürdü</translation>
</message>
@@ -1007,7 +1018,7 @@ bu süreç sırasında ek yetki talebinde bulunabilir.</translation>
<message>
<location filename="../src/updater/ocupdater.cpp" line="89"/>
<source>Update status is unknown: Did not check for new updates.</source>
- <translation type="unfinished"/>
+ <translation>Güncelleme durumu bilinmiyor: Yeni güncellemeler denetlenemedi.</translation>
</message>
<message>
<location filename="../src/updater/ocupdater.cpp" line="93"/>
@@ -2006,7 +2017,7 @@ Bu dosyaları tekrar eşitlemeyi deneyin.</translation>
<message>
<location filename="../src/mirall/syncengine.cpp" line="358"/>
<source>Hard links are not supported in syncing.</source>
- <translation type="unfinished"/>
+ <translation>Sabit bağlantılar eşitlemede desteklenmemektedir.</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="361"/>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 316a88d..7acff5c 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -308,78 +308,89 @@ Total time left %5</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -388,17 +399,17 @@ Are you sure you want to perform this operation?</source>
Ви дійсно бажаєте продовжити цю операцію?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>Видалити усі файли?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>Видалити усі файли</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>Зберегти файли</translation>
</message>
@@ -625,17 +636,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index c9b30a2..7241e7b 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -308,78 +308,89 @@ Total time left %5</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已移除。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已下载。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 和 %2 个其它文件已更新。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已更新。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已移动至 %2。</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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>
@@ -388,17 +399,17 @@ Are you sure you want to perform this operation?</source>
你确定执行该操作吗？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
@@ -625,17 +636,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>未能收到来自服务器的 E-Tag，请检查代理/网关</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>我们收到了不同的恢复 E-Tag，将在下次尝试。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index 78df7fe..1d358d0 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -308,95 +308,106 @@ Total time left %5</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="337"/>
+ <location filename="../src/mirall/folder.cpp" line="339"/>
<source>%1: %2</source>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="423"/>
+ <location filename="../src/mirall/folder.cpp" line="430"/>
<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="425"/>
+ <location filename="../src/mirall/folder.cpp" line="432"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="430"/>
+ <location filename="../src/mirall/folder.cpp" line="437"/>
<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="432"/>
+ <location filename="../src/mirall/folder.cpp" line="439"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="437"/>
+ <location filename="../src/mirall/folder.cpp" line="444"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="439"/>
+ <location filename="../src/mirall/folder.cpp" line="446"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="444"/>
+ <location filename="../src/mirall/folder.cpp" line="451"/>
<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="446"/>
+ <location filename="../src/mirall/folder.cpp" line="453"/>
<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="451"/>
+ <location filename="../src/mirall/folder.cpp" line="458"/>
<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="453"/>
+ <location filename="../src/mirall/folder.cpp" line="460"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="461"/>
+ <location filename="../src/mirall/folder.cpp" line="465"/>
+ <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="467"/>
+ <source>%1 could not be synced due to an error. See the log for details.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/mirall/folder.cpp" line="475"/>
<source>Sync Activity</source>
<translation>同步啟用</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="607"/>
+ <location filename="../src/mirall/folder.cpp" line="621"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="779"/>
+ <location filename="../src/mirall/folder.cpp" line="793"/>
<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="783"/>
+ <location filename="../src/mirall/folder.cpp" line="797"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="785"/>
+ <location filename="../src/mirall/folder.cpp" line="799"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/mirall/folder.cpp" line="786"/>
+ <location filename="../src/mirall/folder.cpp" line="800"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
@@ -623,17 +634,17 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="492"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="493"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="499"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="500"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="526"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="527"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list